- wine-devel - winehq.org

Re: [PATCH] Use todo_wine_if() in tests.
by Marvin 11 May '16

11 May '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22950 Your paranoid android. === w8 (32 bit capture) === capture.c:181: Test failed: Position 1015 expected 0 capture.c:231: Test failed: Position 2167 expected 1463 capture.c:262: Test failed: Position 2167 expected 1463 capture.c:324: Test failed: Position 3255 gap 1344 capture.c:348: Test failed: Position 4343 expected 3703 capture.c:373: Test failed: Position 4791 expected 4151 === w864 (32 bit capture) === capture.c:181: Test failed: Position 1079 expected 0 capture.c:231: Test failed: Position 2167 expected 1527 capture.c:262: Test failed: Position 2167 expected 1527 capture.c:324: Test failed: Position 3127 gap 1152 capture.c:328: Test failed: GCP 13888 vs. BufferSize 21996 capture.c:348: Test failed: Position 4215 expected 3575 capture.c:349: Test failed: flags 1 capture.c:373: Test failed: Position 5303 expected 4023 capture.c:374: Test failed: flags 1 === w1064 (32 bit capture) === capture.c:181: Test failed: Position 1143 expected 0 capture.c:231: Test failed: Position 2167 expected 1591 capture.c:262: Test failed: Position 2167 expected 1591 capture.c:324: Test failed: Position 4215 gap 2176 capture.c:328: Test failed: GCP 11648 vs. BufferSize 21996 capture.c:348: Test failed: Position 5303 expected 4663 capture.c:349: Test failed: flags 1 capture.c:373: Test failed: Position 6391 expected 5111 capture.c:374: Test failed: flags 1 === w1064 (64 bit capture) === capture.c:181: Test failed: Position 1143 expected 0 capture.c:231: Test failed: Position 2167 expected 1591 capture.c:262: Test failed: Position 2167 expected 1591 capture.c:324: Test failed: Position 4215 gap 2176 capture.c:328: Test failed: GCP 11648 vs. BufferSize 21996 capture.c:348: Test failed: Position 5303 expected 4663 capture.c:349: Test failed: flags 1 capture.c:373: Test failed: Position 7287 expected 5111 capture.c:374: Test failed: flags 1

1 0

Re: fusion: Clear all memory for the pathname in test_assembly_name_props_line.
by André Hentschel 10 May '16

10 May '16

Am 08.05.2016 um 22:09 schrieb Gerald Pfeifer: > str is declared WCHAR str[MAX_PATH], so we need to account for > the size of WCHAR when clearing memory. > > Gerald > > Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> > --- > dlls/fusion/tests/asmname.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c > index e415c3a9..8962630 100644 > --- a/dlls/fusion/tests/asmname.c > +++ b/dlls/fusion/tests/asmname.c > @@ -358,7 +358,7 @@ static void test_assembly_name_props_line(IAssemblyName *name, > to_widechar(expect, vals[i].val); > > size = MAX_PATH; > - ZeroMemory(str, MAX_PATH); > + ZeroMemory(str, MAX_PATH*sizeof(WCHAR)); why not sizeof(str)?

1 0

Re: [v2] riched20: Properly clear all of a buffer of type WCHAR. WCHAR.
by Huw Davies 10 May '16

10 May '16

On 10 May 2016, at 12:53, Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > > Per Huw's preference (when I offered an alternate approach), this now > properly clears this buffer (which is of type WCHAR, so MAX_BUF_LEN > fell short). > > Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> > --- > dlls/riched20/tests/editor.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c > index ae9c0a5..3678b95 100644 > --- a/dlls/riched20/tests/editor.c > +++ b/dlls/riched20/tests/editor.c > @@ -3822,7 +3822,7 @@ static void test_EM_SETTEXTEX(void) > getText.flags = GT_DEFAULT; > getText.lpDefaultChar = NULL; > getText.lpUsedDefChar = NULL; > - memset(buf, 0, MAX_BUF_LEN); > + memset(buf, 0, sizeof buf); > SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); > ok(lstrcmpW(buf, TestItem2) == 0, > "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n”); I’d prefer "sizeof(buf)", since that’s what’s used further down this function (and in most other places in Wine for that matter). Huw. > @@ -3837,7 +3837,7 @@ static void test_EM_SETTEXTEX(void) > getText.flags = GT_USECRLF; /* <-- asking for CR -> CRLF conversion */ > getText.lpDefaultChar = NULL; > getText.lpUsedDefChar = NULL; > - memset(buf, 0, MAX_BUF_LEN); > + memset(buf, 0, sizeof buf); > SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); > ok(lstrcmpW(buf, TestItem1) == 0, > "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); > -- > 2.8.1

1 0

Re: [5/5] imm32, user32: Create and destroy the default IME window implicitly. (try 2)
by Aric Stewart 10 May '16

10 May '16

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> On 5/8/16 6:25 AM, Akihiro Sagawa wrote: > Fix bug 34056. > Try 2: > - Another approach to maintain default IME windows --- no more using hooks. > - Add an internal API to imm32 as thread_data is still there. > - User32 keeps reference counter in TEB block and call the new API > when creating/destroying a window. > > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/imm.c | 34 ++++++++++++++++++++++++++-------- > dlls/imm32/imm32.spec | 1 + > dlls/imm32/tests/imm32.c | 4 ++-- > dlls/user32/misc.c | 4 +++- > dlls/user32/user_private.h | 2 ++ > dlls/user32/win.c | 40 ++++++++++++++++++++++++++++++++++++++++ > 6 files changed, 74 insertions(+), 11 deletions(-) > > > >

1 0

Re: [4/5] imm32/tests: Add tests for life cycle of default IME window. (try 2)
by Aric Stewart 10 May '16

10 May '16

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> On 5/8/16 6:25 AM, Akihiro Sagawa wrote: > Try 2: > Mark Vista's behaviour as broken and add visible window tests. > > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/tests/imm32.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 59 insertions(+) > > > >

1 0

Re: [3/5] imm32: Use wine_dbgstr_rect() and wine_dbgstr_point() in traces.
by Aric Stewart 10 May '16

10 May '16

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> On 5/8/16 6:25 AM, Akihiro Sagawa wrote: > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/imm.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > > > >

1 0

Re: [2/5] imm32: Avoid null pointer dereference in trace.
by Aric Stewart 10 May '16

10 May '16

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> On 5/8/16 6:25 AM, Akihiro Sagawa wrote: > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/imm.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > > >

1 0

Re: ddraw/tests: Fix a typo in ok() message (v2)
by Marvin 09 May '16

09 May '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22928 Your paranoid android. === w864 (32 bit d3d) === d3d.c:2326: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2510: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2657: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level === w1064 (32 bit d3d) === d3d.c:2326: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2510: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2657: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level

1 0

No commits for a few days
by Alexandre Julliard 09 May '16

09 May '16

Folks, I'll be out for a few days, so there won't be any commits this week. Feel free to still submit patches, I'll try to catch up next weekend, and release 1.9.10 early the week of May 16. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH v2] riched20: Don't call UpdateWindow after setting the background color.
by Huw Davies 09 May '16

09 May '16

On Sun, May 08, 2016 at 11:42:59PM -0600, Alex Henrie wrote: > diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c > index ae9c0a5..a780c2e 100644 > --- a/dlls/riched20/tests/editor.c > +++ b/dlls/riched20/tests/editor.c > @@ -8337,6 +8337,18 @@ static void test_rtf_specials(void) > DestroyWindow( edit ); > } > > +static void test_background(void) > +{ > + HWND hwndRichEdit = new_richedit(NULL); > + > + /* set the background color to black */ > + ValidateRect(hwndRichEdit, NULL); > + SendMessageA(hwndRichEdit, EM_SETBKGNDCOLOR, FALSE, RGB(0, 0, 0)); > + ok(GetUpdateRect(hwndRichEdit, NULL, FALSE), "Update rectangle is empty!\n"); > + > + DestroyWindow(hwndRichEdit); > +} > + Please don't add an extra line after the function. > > START_TEST( editor ) > { Otherwise, this looks good. Thanks, Huw.

2 2

Re: [PATCH 1/6] d3drm: Introduce d3drm_texture_destroy helper (resend).
by Henri Verbeet 09 May '16

09 May '16

On 8 May 2016 at 12:31, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > @@ -44,6 +44,11 @@ static inline struct d3drm_texture *impl_from_IDirect3DRMTexture3(IDirect3DRMTex > return CONTAINING_RECORD(iface, struct d3drm_texture, IDirect3DRMTexture3_iface); > } > > +void d3drm_texture_destroy(struct d3drm_texture *texture) You're not using this outside of texture.c. > @@ -724,7 +729,7 @@ static ULONG WINAPI d3drm_texture3_Release(IDirect3DRMTexture3 *iface) > if (!refcount) > { > d3drm_object_cleanup((IDirect3DRMObject*)iface, &texture->obj); > - HeapFree(GetProcessHeap(), 0, texture); > + d3drm_texture_destroy(texture); > } The d3drm_object_cleanup() call should be part of d3drm_texture_destroy().

1 0

Re: [PATCH 2/2] wined3d: Support WINED3DUSAGE_TEXTURE in debug_d3dusage
by Henri Verbeet 09 May '16

09 May '16

On 7 May 2016 at 12:17, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > @@ -3573,6 +3573,7 @@ const char *debug_d3dusage(DWORD usage) > WINED3DUSAGE_TO_STR(WINED3DUSAGE_DYNAMIC); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_AUTOGENMIPMAP); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_DMAP); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTURE); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_STATICDECL); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_OVERLAY); > #undef WINED3DUSAGE_TO_STR Please add the other missing values as well.

1 0

Re: wined3d: Fix a typo in FIXME() messages
by Henri Verbeet 09 May '16

09 May '16

On 1 May 2016 at 10:55, Andrey Gusev <andrey.goosev(a)gmail.com> wrote: > - FIXME("Unrecognied FBO status 0x%08x\n", status); > + FIXME("Unrecognized FBO status 0x%08x\n", status); ... > - FIXME("Unrecognied GL error 0x%08x\n", error); > + FIXME("Unrecognized GL error 0x%08x\n", error); Like the d3d9/tests patch.

1 0

Re: d3d9/tests: Fix a typo in skip() message
by Henri Verbeet 09 May '16

09 May '16

On 1 May 2016 at 10:53, Andrey Gusev <andrey.goosev(a)gmail.com> wrote: > - skip("Failed to create a vetex shader\n"); > + skip("Failed to create a vertex shader\n"); The typo fix is fine of course, but if you're going to touch the line please fix the punctuation as well.

1 0

Re: [PATCH v2] d3d11/test: Test for ID3D11InfoQueue interface
by Józef Kucia 09 May '16

09 May '16

On Mon, May 9, 2016 at 11:04 AM, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Added sign. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/d3d11/tests/d3d11.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c > index 03b6113..988c83b 100644 > --- a/dlls/d3d11/tests/d3d11.c > +++ b/dlls/d3d11/tests/d3d11.c > @@ -882,6 +882,11 @@ static void test_device_interfaces(void) > "Device should implement ID3D10Multithread interface, hr %#x.\n", hr); > if (SUCCEEDED(hr)) IUnknown_Release(iface); > > + hr = ID3D11Device_QueryInterface(device, &IID_ID3D11InfoQueue, (void **)&iface); > + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, > + "Device should implement ID3D11InfoQueue interface, hr %#x.\n", hr); > + if (SUCCEEDED(hr)) IUnknown_Release(iface); > + > hr = ID3D11Device_QueryInterface(device, &IID_ID3D10Device, (void **)&iface); > todo_wine ok(hr == E_NOINTERFACE, "Device should not implement ID3D10Device interface, hr %#x.\n", hr); > if (SUCCEEDED(hr)) IUnknown_Release(iface); I think this test is wrong. AFAIK ID3D11InfoQueue is only available when you have the debug layer enabled. You can enable the debug layer by creating a device with the D3D11_CREATE_DEVICE_DEBUG flag.

1 0

Re: msi: Do not return success on failure (spotted by clang)
by Hans Leidekker 09 May '16

09 May '16

On Sun, 2016-05-08 at 18:31 +0300, Kirill Smirnov wrote: > Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> > --- > dlls/msi/where.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/msi/where.c b/dlls/msi/where.c > index e3bc9b7..ddd8c07 100644 > --- a/dlls/msi/where.c > +++ b/dlls/msi/where.c > @@ -593,7 +593,7 @@ static UINT WHERE_evaluate( MSIWHEREVIEW *wv, const > UINT rows[], > > default: > ERR("Invalid expression type\n"); > - break; > + return ERROR_FUNCTION_FAILED; > } > > return ERROR_SUCCESS; It doesn't apply here: $ patch -p1 --dry-run < 122148 checking file dlls/msi/where.c patch: **** malformed patch at line 16: UINT rows[], Looks like your mail client wrapped long lines.

1 0

Re: riched20: Properly clear all of a buffer of type WCHAR.
by Huw Davies 09 May '16

09 May '16

On Sun, May 08, 2016 at 10:15:49PM +0200, Gerald Pfeifer wrote: > buf is an array of WCHAR, so this memset falls short. > > If you prefer, I can submit a patch that rather uses sizeof(buf); > just let me know. Hi Gerald, Yes, please use sizeof(buf). Thanks, Huw.

1 0

Re: [Bug 40598] Warframe launcher connection timeout
by Linda Licari 09 May '16

09 May '16

yes here is a list of messages when run from the development version fixme:olepicture:OleLoadPictureEx (0x16d8524,3270,0,{7bf80980-bf32-101a-8bbb-00aa00300cab},x=0,y=0,f=0,0x32faa0), partially implemented. fixme:ieframe:OleControl_FreezeEvents (0x179240)->(1) fixme:ieframe:PersistStreamInit_Load (0x179240)->(0x16d8524) fixme:ieframe:ViewObject_SetAdvise aspects and/or flags not supported yet fixme:ieframe:WebBrowser_QueryInterface (0x179240)->({55980ba0-35aa-11cf-b671-00aa004cd6d8} 0x32fa4c) interface not supported fixme:nls:GetThreadPreferredUILanguages 00000034, 0x32ef14, 0x32ef84 0x32ef1c fixme:nls:get_dummy_preferred_ui_language (0x34 0x32ef14 0x32ef84 0x32ef1c) returning a dummy value (current locale) fixme:olepicture:OleLoadPictureEx (0x16d8524,4137,1,{7bf80980-bf32-101a-8bbb-00aa00300cab},x=0,y=0,f=0,0x32fa70), partially implemented. fixme:olepicture:OleLoadPictureEx (0x16d8524,359907,1,{7bf80980-bf32-101a-8bbb-00aa00300cab},x=0,y=0,f=0,0x32fa70), partially implemented. fixme:olepicture:OLEPictureImpl_SaveAsFile (0x16b270)->(0x148b48, 0, 0x0), hacked stub. fixme:olepicture:OLEPictureImpl_FindConnectionPoint no connection point for {33ad4ed2-6699-11cf-b70c-00aa0060d393} fixme:olepicture:OLEPictureImpl_FindConnectionPoint no connection point for {33ad4f92-6699-11cf-b70c-00aa0060d393} fixme:olepicture:OLEPictureImpl_FindConnectionPoint no connection point for {33ad4f92-6699-11cf-b70c-00aa0060d393} fixme:ieframe:OleControl_FreezeEvents (0x179240)->(0) fixme:ieframe:OleControl_FreezeEvents (0x179240)->(1) fixme:ieframe:ViewObject_SetAdvise aspects and/or flags not supported yet Regards, Linda Licari On Sun, May 8, 2016 at 5:41 PM <wine-bugs(a)winehq.org> wrote: > https://bugs.winehq.org/show_bug.cgi?id=40598 > > Sebastian Lackner <sebastian(a)fds-team.de> changed: > > What |Removed |Added > > ---------------------------------------------------------------------------- > Component|-unknown |-unknown > Product|Wine-staging |Wine > > --- Comment #1 from Sebastian Lackner <sebastian(a)fds-team.de> --- > Thanks for the bug report. Could you please test if this issue also occurs > with > the development version of Wine? If it occurs in both versions, the "Wine" > product is more appropriate. > > -- > Do not reply to this email, post in Bugzilla using the > above URL to reply. > You are receiving this mail because: > You are watching all bug changes. > > > -- - Try and fail but don't fail to try.

1 0

Re: [PATCH 1/2] riched20: Don't call UpdateWindow after setting the background color.
by Bruno Jesus 09 May '16

09 May '16

On Fri, May 6, 2016 at 11:04 AM, Alex Henrie <alexhenrie24(a)gmail.com> wrote: > +static void test_background(void) > +{ > + HWND hwndRichEdit = new_richedit(NULL); > + RECT updateRect; > + > + /* set the background color to black */ > + ValidateRect(hwndRichEdit, NULL); > + SendMessageA(hwndRichEdit, EM_SETBKGNDCOLOR, FALSE, 0); > + GetUpdateRect(hwndRichEdit, &updateRect, FALSE); > + ok(!IsRectEmpty(&updateRect), "The update rect should not be empty\n"); > + > + DestroyWindow(hwndRichEdit); > +} I believe you should clear updateRect before calling GetUpdateRect, also according to msdn the return value of GetUpdateRect should also reflect if the rect was changed or not so it could be a double test. Best wishes, Bruno

2 1

[PATCH] po: Update Norwegian translation
by Beren Camlost 08 May '16

08 May '16

A couple of my own errors that slipped through the cracks. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 5cc5229..848c720 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: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-05-04 12:00+0200\n" +"PO-Revision-Date: 2016-05-08 20:00+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" @@ -11632,14 +11632,14 @@ msgid "" "occurred.\n" msgstr "" "reg: Kan ikke slette alle registerverdiene i \"%1\". Ett uventet " -"problemoppstod.\n" +"problem oppstod.\n" #: reg.rc:54 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" -"reg: Kan ikke fullføre den spesifiserte operasjonen. Ett uventetproblem " +"reg: Kan ikke fullføre den spesifiserte operasjonen. Ett uventet problem " "oppstod.\n" #: reg.rc:55 -- 1.9.1

1 1

Re: [PATCH 5/6] d3drm: Implement IDirect3DRMTexture*::InitFromFile.
by Stefan Dösinger 08 May '16

08 May '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-05-08 um 11:31 schrieb Aaryaman Vasishta: > + /* d3drm intentionally leaks a reference to IDirect3DRM here if texture has already been initialized. */ > + if (texture->d3drm) > + IDirect3DRM_AddRef(texture->d3drm); > + > + if (texture->image) > + return D3DRMERR_BADOBJECT; > + if (FAILED(hr = d3drm_texture_load(texture, filename, FALSE))) > + return hr; Does it also leak if the file fails to load? It's probably better to create the image and then pass it to InitFromImage instead of re-coding this part. Is there any situation where texture->d3drm would be NULL? The same question applies to the newly introduced check in d3drm_texture_destroy. > + /* Use an internal destroy callback to destroy image struct */ > + hr = IDirect3DRMObject_AddDestroyCallback(&texture->IDirect3DRMTexture3_iface, destroy_image_callback, texture); > + > +cleanup: > + UnmapViewOfFile(buffer); > + CloseHandle(hmapping); > + CloseHandle(hfile); > + > + return hr; You'll leak the image if AddDestroyCallback fails. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXL2hHAAoJEN0/YqbEcdMwezQP/0X9Ik1RbPNFRgvvFRxhrFQE VLstrghPD28bQQ2i7YoVsdNCZMCyIQa+7GVzI/3d5pakyldEr/7OVIvHHGyxa8j/ YP2O0JTNGxVVhNB0pUM6bEPpnUj7BOPm0uCkcPhU42QVevzKBL7jUnl5Jx/j+j0K Dld9+WDh3i2sSsrtFg2MLdsi4oG5ej3eOFuN2jibceK5hLR4UI1vwyyccCsD+Xd3 NmKnG6KMfiQsvVjxW7IoO5qDcmzZsKzdnMHFgL93KKkOkP2SBhODJckiWNNeswcr XFjd6r9NBIZsFGdIBM040ph4gd/cu7h3R/IWw2hG++oQ+qxX0NOH61GNoUasjyQh hKjyVqmjJa6MUPezzqoFv3XRPQGVnz4Q3l7GSp0QQYCJYtZR+8vey3ezkIuvfFNA GszecmBvvi3Bv4Ir6JriJSUjTC73EcluKhS6WmFk+UxABrn0TBGSgFWkMENdxP6F vE90h/a/JumNtdlCibpB/ctFP7NIWDs2Uz7RjrCQUPaXH86+hUtcs92farOi7JzV EuwzXW1a2qgb7O6ZHWSxdCTvmJZy9rjS1gP8aH0gqUWaxr1FjJsPiOvSWU1/P1QX qD/M/kENP4O0tmsI/dwnDRJ6lHf8FH71uNR0kRq2eWJa/clFdC+h5uMHRDx5w+iy jlZ0/xkcdFzzaOJV1Yw0 =cwCD -----END PGP SIGNATURE-----

2 1

Re: [PATCH 3/6] d3drm: Implement IDirect3DRM*_CreateTexture. (v3)
by Stefan Dösinger 08 May '16

08 May '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-05-08 um 11:31 schrieb Aaryaman Vasishta: > + if (!d3drm_validate_image(image)) > + return D3DRMERR_BADVALUE; Is this necessary? InitFromImage does it anyway I think. > > if (FAILED(hr = d3drm_texture_create(&object))) > return hr; You could call the public CreateObject method here, but I don't have a strong opinion on this. > + object->d3drm = &d3drm->IDirect3DRM_iface; Afaics InitFromImage does it anyway. It also causes problems when InitFromImage fails for some reason - you'll decref the d3drm object in the error path below. > + if (FAILED(hr = IDirect3DRMTexture3_InitFromImage(&object->IDirect3DRMTexture3_iface, image))) > + { > + d3drm_texture_destroy(object); > + return hr; > + } -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXL2HbAAoJEN0/YqbEcdMw9JcP/iXXJN5PuvyuLqki+eKgQHCv fdRtBfdm57foN7+hfOcG9hZGgVWpdPMj5YFZmNhCaWKlnNjcxKDJE/ZsjsRaYXmD pKPb6mLbNcZVBHyNeqbRcwlgJBiDLYIHM8BiT5DwssQK2lo8UmhVGJgmNZNPlGy8 sw/drdMg0lW11N6rOZR/fXcm5NY9F7oIAuI9945uElbOXg3byBvLAQdpPE95yJ5p 8rAQotCsbnqzGFEyRw3E1+0uKplBoaXd6ML+jhDrHK9Eqw0XWUtUsCuWiaYkTDGX 82XXWjhjsxQ84GkSKOweqtum6HjGDSnSZz12YTDMbspLywIpKzSMO5+O/dtxsolI a5scAHlpYQ/bLK3TCWOkwNEsMkXBRjM8+j+PX1I3SQICdl3GmNxVo/b4ZU+0Wqt5 GwzyerUB2an5Dyf/+l7jqH0SxWgcrIiwa/ZTCxttAafDSooFhERwj402WhNQcZLN BD9Jef52AYCJrduV3b3udvTyPuWCrPkkrm3NTSO6dbCIZG9EzMcujJZnA0D52y2E qwfpfsfNNUJ7hkS1322u48i7GaSCZNoK6ISlA9RqtjVoRCGZKG/nGTwQgznrclB1 mvR24DUvAmogeTV0Akm20wUN3/n5sIkz47b0vb9Z5Jjg1v+90nTQ43pcMT0GCJhP cN0YfnUAgpi7yD4yfA1E =JJ9X -----END PGP SIGNATURE-----

2 2

Re: [PATCH 2/6] d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage. (v3)
by Stefan Dösinger 08 May '16

08 May '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-05-08 um 11:31 schrieb Aaryaman Vasishta: > + hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg); > + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %x.\n", hr); > + /* Release leaked reference to d3drm1 */ > + IDirect3DRM_Release(d3drm1); I think it's a good idea to explicitly test the increased refcount after this failing call. > + if (!image > + || !image->rgb > + || !image->red_mask > + || !image->green_mask > + || !image->blue_mask > + || !image->buffer1) > + { > + return FALSE; > + } I guess that there's some way to pass palletized images, e.g. by setting rgb = 0, palette_size != 0 and palette != NULL. This shouldn't be part of this patch though and I am fine with this code as it is. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXL2SsAAoJEN0/YqbEcdMwkCQP/iPRJdsglD3on0uzy9v8iQo9 g0BexNDM4r1AtZASW9yp6dNRLY1oX15dTSM6GjdNlNFGp7jQRVJcJ6X71CJt4EEi oGWtq774F46ewtTjcufP/TOfOed6k6tv/qe6IKRn2rnI7CyusM124jIP4CYZfAlW dk48LOKp9G9kzF3loa6Cx4Eoxmy1jAfXJ5v/ERGqgU/wHwT8Vaim+5URIglfPq0H OUG++D6WTacsh1RWGZaeQqLAVq2zlc5YxNNsgJ7iJcd7DG1EYg6hOFFHebwp5FQP Jq6Dipy1GGB4q+Zt/ygb6HwWsv36taLMVn2erEL2RG6O88QxmM+P3VyxTBNdWKQc 65SHOcq0NjLhT6sO4SSfm5lEsWDBxftzbUuSg9NngrZjmLBa4pfreckYhA+N/p2Y Jd1GBtpvO7w5XTOLYoHWvco2rrRVCmJan/Q/XAensQyFBkkt7+S8Rjjo7KcT1avF Lv7WQqg+2HTHJbiiSp13BsoNZQaDZaDEaINsBv56B+LJjBKf3EwJLCZXpRRN3p0v ByLGPYr7QS3NrukltC9Zb3ZEf2FWBtB8mDBYjh5sHmquujAwlZx85HdaqFEi9ZCb tIzD3O8yO4k5rwM/+fClBLHmeTUEemnG1LrwxgvOR2pAq6/mK67clDmOZJ4CSBBt YjYtXXnjuSBzcnvnvp3J =KSDQ -----END PGP SIGNATURE-----

2 1

Re: [PATCH 4/6] d3drm: Implement IDirect3DRMTexture*_GetImage (resend).
by Stefan Dösinger 08 May '16

08 May '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-05-08 um 11:31 schrieb Aaryaman Vasishta: > d3drm_img = NULL; d3drm_img = > IDirect3DRMTexture2_GetImage(texture2); - todo_wine > ok(!!d3drm_img, "Failed to get image.\n"); - todo_wine > ok(d3drm_img == &initimg, "Expected image returned == %p, got > %p.\n", &initimg, d3drm_img); + ok(!!d3drm_img, "Failed to get > image.\n"); + ok(d3drm_img == &initimg, "Expected image returned > == %p, got %p.\n", &initimg, d3drm_img); This is a problem of the exiting code code more than the patch: The d3drm_img = NULL assignment is redundant. Since GetImage returns the image as a return value the destination will be overwritten, no matter how GetImage behaves. The problem of a getter not writing anything can only happen when you pass a pointer and the function writes a value to that pointer. What happens when GetImage is called on an uninitialized Texture? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXL2QqAAoJEN0/YqbEcdMwYD0P/i4GqKylB9vvWa64h6Hph+li +tVW8KNgbjaPaJJfvEZRG3t1hToqFogSKU0TBBTnhv7zGuU5wKHr4a+UwkFFjQSx ww/jzuQXu7coJ28CZrGBeDqMAadR3RCZHcdKD+czzn5bBy/8LCzrX4Id/1qpdf+Y PZtdtF9R7e1poYjctPJXtcOzJlwtEF3+JkGUiyjcH3kNoammqmpRf6FeSFxXrvUB frVrNHIaLU6Cg8MaoyC6aYOOuf1KHH/5Nym3kAvR7Ty+0PNo38g23/+DMtN5553r IvaYHSsmzK10LsH6/xgkDQk9fpkEX6eTgW/wbd+p++L3fauDMjk6KxMVgPFpEF4g 2hRrKw5TTdvY3LftbC5VZDtnKZeFX5hwiysZZEztFLW/Rk85qgJUo36cq9QR1XE6 fwOH77QYO0+bv2+9TXyyh20RIQshLbN4Pzx5jWxC9Ym9InEWevLKXTQrjt+ve5bl YL+202MXZ1hc/cuCk/HOLrCg2B8XkSN/Sj5ziszhyXJk8kHv/FRyfMa5+p3Ngyrn ZBE464osVWL8pSdJeadb1Nud7aWVfW+RIaun8RgwDAhFpRnStEZyfW0FxrVkfQBY BdDTGORUrFDfsVs8xLsQwKI/xaq3vKZJJ2oZbnnIek0P2q0TVYCP8eXlu2o2ARvd rXSlOmyAYudSsOeqz9ED =mT+3 -----END PGP SIGNATURE-----

1 0

Re: [PATCH 6/6] d3drm: Partially implement IDirect3DRM*::LoadTexture. (v4)
by Aaryaman Vasishta 08 May '16

08 May '16

See patch 5/6 for the v4 changes. Cheers, Aaryaman On Sun, May 8, 2016 at 4:01 PM, Aaryaman Vasishta <jem456.vasishta(a)gmail.com > wrote: > v4: Removed various leaks, avoided redundant usage of HEAP_ZERO_MEMORY. > > Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > --- > dlls/d3drm/d3drm.c | 32 +++++++++++++++++++++++++------- > dlls/d3drm/tests/d3drm.c | 33 +++++++++++++-------------------- > 2 files changed, 38 insertions(+), 27 deletions(-) > > diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c > index 6c6007d..c74d5d8 100644 > --- a/dlls/d3drm/d3drm.c > +++ b/dlls/d3drm/d3drm.c > @@ -418,11 +418,18 @@ static HRESULT WINAPI d3drm1_LoadTexture(IDirect3DRM > *iface, > struct d3drm_texture *object; > HRESULT hr; > > - FIXME("iface %p, filename %s, texture %p stub!\n", iface, > debugstr_a(filename), texture); > + TRACE("iface %p, filename %s, texture %p.\n", iface, > debugstr_a(filename), texture); > > if (FAILED(hr = d3drm_texture_create(&object))) > return hr; > > + object->d3drm = iface; > + if (FAILED(hr = > IDirect3DRMTexture_InitFromFile(&object->IDirect3DRMTexture_iface, > filename))) > + { > + d3drm_texture_destroy(object); > + return hr; > + } > + > *texture = &object->IDirect3DRMTexture_iface; > > return D3DRM_OK; > @@ -861,17 +868,19 @@ static HRESULT WINAPI > d3drm2_CreateUserVisual(IDirect3DRM2 *iface, > static HRESULT WINAPI d3drm2_LoadTexture(IDirect3DRM2 *iface, > const char *filename, IDirect3DRMTexture2 **texture) > { > - struct d3drm_texture *object; > + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); > + IDirect3DRMTexture3 *texture3; > HRESULT hr; > > - FIXME("iface %p, filename %s, texture %p stub!\n", iface, > debugstr_a(filename), texture); > + TRACE("iface %p, filename %s, texture %p.\n", iface, > debugstr_a(filename), texture); > > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (FAILED(hr = IDirect3DRM3_LoadTexture(&d3drm->IDirect3DRM3_iface, > filename, &texture3))) > return hr; > > - *texture = &object->IDirect3DRMTexture2_iface; > + hr = IDirect3DRMTexture3_QueryInterface(texture3, > &IID_IDirect3DRMTexture2, (void **)texture); > + IDirect3DRMTexture3_Release(texture3); > > - return D3DRM_OK; > + return hr; > } > > static HRESULT WINAPI d3drm2_LoadTextureFromResource(IDirect3DRM2 *iface, > HMODULE module, > @@ -1413,14 +1422,23 @@ static HRESULT WINAPI > d3drm3_CreateUserVisual(IDirect3DRM3 *iface, > static HRESULT WINAPI d3drm3_LoadTexture(IDirect3DRM3 *iface, > const char *filename, IDirect3DRMTexture3 **texture) > { > + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); > struct d3drm_texture *object; > HRESULT hr; > > - FIXME("iface %p, filename %s, texture %p stub!\n", iface, > debugstr_a(filename), texture); > + TRACE("iface %p, filename %s, texture %p.\n", iface, > debugstr_a(filename), texture); > > if (FAILED(hr = d3drm_texture_create(&object))) > return hr; > > + object->d3drm = &d3drm->IDirect3DRM_iface; > + if (FAILED(hr = > IDirect3DRMTexture3_InitFromFile(&object->IDirect3DRMTexture3_iface, > filename))) > + { > + d3drm_texture_destroy(object); > + return hr; > + } > + > + object->d3drm = &d3drm->IDirect3DRM_iface; > *texture = &object->IDirect3DRMTexture3_iface; > > return D3DRM_OK; > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index e6311d8..4cf3ba7 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -4510,18 +4510,16 @@ static void test_load_texture(void) > hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); > ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", > i, hr); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got > ref1 = %u, ref2 = %u.\n", i, ref1, ref2); > + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, > ref2 = %u.\n", i, ref1, ref2); > > hr = IDirect3DRMTexture_InitFromFile(texture1, filename); > - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == > D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == > D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > /* InitFromFile seems to AddRef IDirect3DRM even if it fails. */ > - if (FAILED(hr)) > - IDirect3DRM_Release(d3drm1); > + IDirect3DRM_Release(d3drm1); > > d3drm_img = IDirect3DRMTexture_GetImage(texture1); > ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); > - if (d3drm_img) > - test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, > tests[i].h, tests[i].palettized); > + test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, > tests[i].palettized); > IDirect3DRMTexture_Release(texture1); > ref2 = get_refcount((IUnknown *)d3drm1); > ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, > ref2 = %u.\n", i, ref1, ref2); > @@ -4537,17 +4535,15 @@ static void test_load_texture(void) > hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); > ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", > i, hr); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got > ref1 = %u, ref2 = %u.\n", i, ref1, ref2); > + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, > ref2 = %u.\n", i, ref1, ref2); > > hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); > - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == > D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > - if (FAILED(hr)) > - IDirect3DRM_Release(d3drm1); > + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == > D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > + IDirect3DRM_Release(d3drm1); > > d3drm_img = IDirect3DRMTexture2_GetImage(texture2); > ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); > - if (d3drm_img) > - test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, > tests[i].h, tests[i].palettized); > + test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, > tests[i].h, tests[i].palettized); > IDirect3DRMTexture2_Release(texture2); > ref2 = get_refcount((IUnknown *)d3drm1); > ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, > ref2 = %u.\n", i, ref1, ref2); > @@ -4563,25 +4559,22 @@ static void test_load_texture(void) > hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); > ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", > i, hr); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got > ref1 = %u, ref2 = %u.\n", i, ref1, ref2); > + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, > ref2 = %u.\n", i, ref1, ref2); > > hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); > - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == > D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > - if (FAILED(hr)) > - IDirect3DRM_Release(d3drm1); > + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == > D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > + IDirect3DRM_Release(d3drm1); > > d3drm_img = IDirect3DRMTexture3_GetImage(texture3); > ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); > - if (d3drm_img) > - test_bitmap_data(i * 7 + 4, d3drm_img, TRUE, tests[i].w, > tests[i].h, tests[i].palettized); > + test_bitmap_data(i * 7 + 4, d3drm_img, TRUE, tests[i].w, > tests[i].h, tests[i].palettized); > /* Test whether querying a version 1 texture from version 3 > causes a > * change in the loading behavior. */ > hr = IDirect3DRMTexture3_QueryInterface(texture3, > &IID_IDirect3DRMTexture, (void **)&texture1); > ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr > %#x.\n", hr); > d3drm_img = IDirect3DRMTexture_GetImage(texture1); > ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); > - if (d3drm_img) > - test_bitmap_data(i * 7 + 5, d3drm_img, TRUE, tests[i].w, > tests[i].h, tests[i].palettized); > + test_bitmap_data(i * 7 + 5, d3drm_img, TRUE, tests[i].w, > tests[i].h, tests[i].palettized); > IDirect3DRMTexture_Release(texture1); > IDirect3DRMTexture3_Release(texture3); > ref2 = get_refcount((IUnknown *)d3drm1); > -- > 2.3.2 (Apple Git-55) > >

1 0

Re: [2/2] shlwapi: Fix crash in wvnsprintfW when buffer or spec is NULL
by Sebastian Lackner 07 May '16

07 May '16

On 06.05.2016 03:56, 谢威 wrote: > Crashes on windows and wine when buffer == NULL && maxlen > 0 > > > 0002-shlwapi-Fix-crash-in-wvnsprintfW-when-buffer-or-spec.patch > > > From f60bd9a76cfc91cb873a15c69f35cea0c7950a68 Mon Sep 17 00:00:00 2001 > From: XieWei <xiewei(a)linuxdeepin.com> > Date: Fri, 6 May 2016 09:49:34 +0800 > Subject: shlwapi: Fix crash in wvnsprintfW when buffer or spec is NULL > > Signed-off-by: XieWei <xiewei(a)linuxdeepin.com> > --- > dlls/shlwapi/wsprintf.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/dlls/shlwapi/wsprintf.c b/dlls/shlwapi/wsprintf.c > index 6a36b6a..ceca82e 100644 > --- a/dlls/shlwapi/wsprintf.c > +++ b/dlls/shlwapi/wsprintf.c > @@ -439,6 +439,9 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list ar > > TRACE("%p %u %s\n", buffer, maxlen, debugstr_w(spec)); > > + if (maxlen <= 0 || (spec == NULL && buffer != NULL)) > + return -1; The first part looks fine, but the second part is not really covered by tests. In fact, you even added a comment that it crashes on Windows XP under a similar situation. Do you really have an application which depends on it? > + > while (*spec && (maxlen > 1)) > { > if (*spec != '%') { *p++ = *spec++; maxlen--; continue; } > -- 2.7.0 > > >

1 0

Re: [1/2] shlwapi/tests: Add wvnsprintfW comformance test
by Sebastian Lackner 07 May '16

07 May '16

Hi, thanks for your contribution. I have a couple of remarks below: On 06.05.2016 03:55, 谢威 wrote: > > 0001-shlwapi-Add-wvnsprintfW-comformance-test.patch > > > From cdaeba38efb4d2edcdff5e6ec7b75fa5b56d52d7 Mon Sep 17 00:00:00 2001 > From: XieWei <xiewei(a)linuxdeepin.com> > Date: Fri, 6 May 2016 09:42:05 +0800 > Subject: shlwapi: Add wvnsprintfW comformance test > > Signed-off-by: XieWei <xiewei(a)linuxdeepin.com> The Wine project requires all contributors to submit patches with their full first and last name. If this isn't your full name, please fix it in your git settings. > --- > dlls/shlwapi/tests/string.c | 78 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 78 insertions(+) > > diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c > index ac14db0..7896827 100644 > --- a/dlls/shlwapi/tests/string.c > +++ b/dlls/shlwapi/tests/string.c > @@ -68,6 +68,7 @@ static INT (WINAPIV *pwnsprintfW)(LPWSTR,INT,LPCWSTR, ...); > static LPWSTR (WINAPI *pStrChrNW)(LPCWSTR,WCHAR,UINT); > static BOOL (WINAPI *pStrToInt64ExA)(LPCSTR,DWORD,LONGLONG*); > static BOOL (WINAPI *pStrToInt64ExW)(LPCWSTR,DWORD,LONGLONG*); > +static INT (WINAPI *pwvnsprintfW)(LPWSTR,INT,LPCWSTR,__ms_va_list); > > static int strcmpW(const WCHAR *str1, const WCHAR *str2) > { > @@ -1601,6 +1602,81 @@ static void test_StrCatChainW(void) > ok(buf[5] == 'e', "Expected buf[5] = 'e', got %x\n", buf[5]); > } > > +static INT _wvnsprintfW_p_wrapper(LPWSTR pdest, INT maxlen, LPCWSTR format, ...) Please declare the function with WINAPIV calling convention. Also please note that a "p" or "lp" prefix is usually omitted new Wine code. > +{ > + INT ret; > + __ms_va_list valist; > + __ms_va_start(valist, format); > + ret = pwvnsprintfW(pdest, maxlen, format, valist); > + __ms_va_end(valist); > + return ret; > +} > + > +static void test_wvnsprintfW(void) > +{ > + INT ret = 0; > + WCHAR buffer[10] = {0}; > + const WCHAR fmt[] = {'1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 0}; > + const WCHAR emptyfmt[] = {0}; > + const WCHAR result1[] = {'1', '2', '3', '4', '5', '6', '7', '8', 0}; > + const WCHAR result2[] = {'1', '2', '3', '4', '5', '6', '7', '8', '9', 0}; > + const WCHAR result3[] = {'1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 0}; > + > + if (!pwvnsprintfW) > + { > + win_skip("wvnsprintfW not available\n"); > + return; > + } Its a matter of taste, but you usually don't need such a check unless you are aware of a specific Windows version where it does not exist. > + > + /* crashes on wine */ > + ret = _wvnsprintfW_p_wrapper(NULL, 0, fmt); > + ok(broken(ret == 0) || ret == -1 /* win7 */, > + "Expected wvnsprintfW to return %d, expected 0 or -1\n", ret); As you also noticed, those tests will crash on Wine, which means you can't really add them until the implementation is fixed. You can either move those tests to your second patch, or change the order of your patches. Also, I think the current ok() message is a bit misleading. Something like "Expected wvnsprintfW to return 0 or -1, got %d\n" would be more clear. This also affects a couple of places below. > + > + if (0) > + { > + /* crashes on wine and XP and win7 */ Wrong indentation in the line above. > + ret = _wvnsprintfW_p_wrapper(NULL, 3/* >0 */, fmt); > + ok(ret == -1, "Expected wvnsprintfW to return -1, got %d\n", ret); > + } > + > + /* crashes on wine */ > + ret = _wvnsprintfW_p_wrapper(buffer, 0, NULL); > + ok(broken(ret == 0) || ret == -1 /* win7 */, > + "Expected wvnsprintfW to return %d, expected 0 or -1\n", ret); > + > + ret = _wvnsprintfW_p_wrapper(buffer, 0, fmt); > + ok(broken(ret == 0) || ret == -1 /* win7 */, > + "Expected wvnsprintfW to return %d, expected 0 or -1\n", ret); > + > + if (0) > + { > + /* crashes on wine and XP */ > + ret = _wvnsprintfW_p_wrapper(buffer, 10, NULL); > + ok(ret == -1, "Expected wvnsprintfW to return -1, got %d\n", ret); > + } > + > + ret = _wvnsprintfW_p_wrapper(buffer, 1, emptyfmt); > + ok(ret == 0, "Expected wvnsprintfW to return 0, got %d\n", ret); This test fails in Wine, which means it should be marked with todo_wine. > + > + ret = _wvnsprintfW_p_wrapper(buffer, 10, emptyfmt); > + ok(ret == 0, "Expected wvnsprintfW to return 0, got %d\n", ret); > + > + ret = _wvnsprintfW_p_wrapper(buffer, sizeof(buffer)/sizeof(buffer[0])-1, fmt); > + ok(broken(ret == 8) || ret == -1 /* win7 */, > + "Expected wvnsprintfW to return %d, expected 8 or -1\n", ret); > + ok(lstrcmpW(buffer, result1) == 0, "Wrong result [%s]\n", wine_dbgstr_w(buffer)); You can omit the "[" and "]" here. wine_dbgstr_w will add quotation marks around the string. > + > + ret = _wvnsprintfW_p_wrapper(buffer, sizeof(buffer)/sizeof(buffer[0]), fmt); > + ok(broken(ret == 9) || ret == -1 /* win7 */, > + "Expected wvnsprintfW to return %d, expected 9 or -1\n", ret); > + ok(lstrcmpW(buffer, result2) == 0, "Wrong result [%s]\n", wine_dbgstr_w(buffer)); > + > + ret = _wvnsprintfW_p_wrapper(buffer, sizeof(buffer)/sizeof(buffer[0])+1, fmt); > + ok(ret == 10, "Expected wvnsprintfW to return 10, got %d\n", ret); > + ok(lstrcmpW(buffer, result3) == 0, "Wrong result [%s]\n", wine_dbgstr_w(buffer)); Those two tests above also fail in Wine, so they should be marked with todo_wine. > +} > + > START_TEST(string) > { > HMODULE hShlwapi; > @@ -1640,6 +1716,7 @@ START_TEST(string) > pwnsprintfW = (void *)GetProcAddress(hShlwapi, "wnsprintfW"); > pStrToInt64ExA = (void *)GetProcAddress(hShlwapi, "StrToInt64ExA"); > pStrToInt64ExW = (void *)GetProcAddress(hShlwapi, "StrToInt64ExW"); > + pwvnsprintfW = (void *)GetProcAddress(hShlwapi, "wvnsprintfW"); > > test_StrChrA(); > test_StrChrW(); > @@ -1687,6 +1764,7 @@ START_TEST(string) > test_StrStrNW(); > test_StrStrNIW(); > test_StrCatChainW(); > + test_wvnsprintfW(); > > CoUninitialize(); > } > -- 2.7.0 > > >

1 0

Re: [PATCH] winemac: Add support for a high-resolution ("Retina") rendering mode.
by Jacek Caban 06 May '16

06 May '16

Hi Ken, On 05/05/16 20:53, Ken Thomases wrote: > This is intended to be combined with increasing the Windows DPI, as via winecfg. > If that is doubled to 192, then, in theory, graphical elements will remain the > same visual size on screen but be rendered with finer detail. Unfortunately, > many Windows programs don't correctly handle non-standard DPI so the results > are not always perfect. > > The registry setting to enable Retina mode is: > > [HKEY_CURRENT_USER\Software\Wine\Mac Driver] > "RetinaMode"="y" > > Note that this setting is not looked for in the AppDefaults\<exe name> key > because it doesn't make sense for only some processes in a Wine session to see > the high-resolution sizes and coordinates. Would it make sense to follow what Windows does in this case? Something like SetProcessDPIAware and manifest support feels related. Thanks, Jacek

2 1

Re: jscript: Properly handle function expressions with identifiers.
by Marvin 06 May '16

06 May '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22883 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

1 0

Re: [PATCH 2/2] riched20: Only call InvalidateRect if the background color changes.
by Alex Henrie 06 May '16

06 May '16

Please ignore this patch. After sending it, I noticed that the backgrounds in Word Viewer changed from gray to white after leaving the tab and returning to it, when on Windows they stay gray the whole time. More tests are needed to determine when exactly InvalidateRect should be called. The first patch is still good, and does not appear to cause any negative side effects. -Alex

1 0

Re: (2/2) advapi32: add some advapi32 wmi functions
by Sebastian Lackner 06 May '16

06 May '16

On 04.05.2016 06:47, Austin English wrote: > -- -Austin > > > 0002-advapi32-add-some-advapi32-wmi-functions.patch > > > From dcdc8a38a72921f17c15c4e39ca0dd6fdb578a0f Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Tue, 3 May 2016 02:17:15 -0500 > Subject: [PATCH 2/2] advapi32: add some advapi32 wmi functions > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/advapi32/Makefile.in | 3 +- > dlls/advapi32/advapi32.spec | 28 +++++----- > dlls/advapi32/wmi.c | 123 ++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 139 insertions(+), 15 deletions(-) > create mode 100644 dlls/advapi32/wmi.c > > diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in > index 6b54295..ff6452a 100644 > --- a/dlls/advapi32/Makefile.in > +++ b/dlls/advapi32/Makefile.in > @@ -18,7 +18,8 @@ C_SRCS = \ > lsa.c \ > registry.c \ > security.c \ > - service.c > + service.c \ > + wmi.c In general adding a new file for all those Wmi commands is probably fine, but please move the existing ones there, too. (for example "WmiOpenBlock") > > IDL_SRCS = svcctl.idl > > diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec > index 3f32aa3..af5286b 100644 > --- a/dlls/advapi32/advapi32.spec > +++ b/dlls/advapi32/advapi32.spec > @@ -795,35 +795,35 @@ > # @ stub WmiDevInstToInstanceNameA > # @ stub WmiDevInstToInstanceNameW > # @ stub WmiEnumerateGuids > -# @ stub WmiExecuteMethodA > -# @ stub WmiExecuteMethodW > +@ stdcall WmiExecuteMethodA(ptr str long long ptr long ptr) Handles should still be traced as "long", not as "ptr". ;) Also, the "outputsize" parameter is traced wrong (should be "ptr"). > +@ stdcall WmiExecuteMethodW(ptr wstr long long ptr long ptr) > # @ stub WmiFileHandleToInstanceNameA > # @ stub WmiFileHandleToInstanceNameW > -# @ stub WmiFreeBuffer > +@ stdcall WmiFreeBuffer(ptr) > # @ stub WmiGetFirstTraceOffset > # @ stub WmiGetNextEvent > # @ stub WmiGetTraceHeader > -# @ stub WmiMofEnumerateResourcesA > -# @ stub WmiMofEnumerateResourcesW > -# @ stub WmiNotificationRegistrationA > -# @ stub WmiNotificationRegistrationW > +@ stdcall WmiMofEnumerateResourcesA(ptr ptr ptr) > +@ stdcall WmiMofEnumerateResourcesW(ptr ptr ptr) > +@ stdcall WmiNotificationRegistrationA(ptr long ptr ptr long) > +@ stdcall WmiNotificationRegistrationW(ptr long ptr ptr long) > @ stdcall WmiOpenBlock(ptr long ptr) > # @ stub WmiOpenTraceWithCursor > # @ stub WmiParseTraceEvent > -# @ stub WmiQueryAllDataA > +@ stdcall WmiQueryAllDataA(ptr ptr ptr) > # @ stub WmiQueryAllDataMultipleA > # @ stub WmiQueryAllDataMultipleW > -# @ stub WmiQueryAllDataW > -# @ stub WmiQueryGuidInformation > +@ stdcall WmiQueryAllDataW(ptr ptr ptr) > +@ stdcall WmiQueryGuidInformation(ptr ptr) > # @ stub WmiQuerySingleInstanceA > # @ stub WmiQuerySingleInstanceMultipleA > # @ stub WmiQuerySingleInstanceMultipleW > @ stub WmiQuerySingleInstanceW > # @ stub WmiReceiveNotificationsA > # @ stub WmiReceiveNotificationsW > -# @ stub WmiSetSingleInstanceA > -@ stub WmiSetSingleInstanceW > -# @ stub WmiSetSingleItemA > -# @ stub WmiSetSingleItemW > +@ stdcall WmiSetSingleInstanceA(ptr str long long ptr) > +@ stdcall WmiSetSingleInstanceW(ptr wstr long long ptr) > +@ stdcall WmiSetSingleItemA(ptr str long long long ptr) > +@ stdcall WmiSetSingleItemW(ptr wstr long long long ptr) > # @ stub Wow64Win32ApiEntry > @ stdcall WriteEncryptedFileRaw(ptr ptr ptr) > diff --git a/dlls/advapi32/wmi.c b/dlls/advapi32/wmi.c > new file mode 100644 > index 0000000..de3f8fa > --- /dev/null > +++ b/dlls/advapi32/wmi.c > @@ -0,0 +1,123 @@ > +/* > + * Win32 advapi/wmi functions > + * > + * Copyright 2016 Austin English > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > + > +#include <stdarg.h> > + > +#include "windef.h" > +#include "winbase.h" > +#include "winerror.h" > +#include "winternl.h" > +#include "wmistr.h" > +#include "ddk/wmium.h" > + > +#include "wine/unicode.h" > +#include "wine/debug.h" > + > +#include "advapi32_misc.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL(wmi); > + > +ULONG WMIAPI WmiExecuteMethodA(WMIHANDLE handle, const CHAR *instance, ULONG method, ULONG inputsize, Please use lowercase 'char' instead of CHAR. > + void *inputbuffer, ULONG *outputsize, void *outputbuffer) > +{ > + FIXME(": %p %s %u %u %p %p %p stub\n", handle, debugstr_a(instance), method, inputsize, inputbuffer, > + outputsize, outputbuffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiExecuteMethodW(WMIHANDLE handle, const WCHAR *instance, ULONG method, ULONG inputsize, > + void *inputbuffer, ULONG *outputsize, void *outputbuffer) > +{ > + FIXME(": %p %s %u %u %p %p %p stub\n", handle, debugstr_w(instance), method, inputsize, inputbuffer, > + outputsize, outputbuffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +VOID WMIAPI WmiFreeBuffer(void *buffer) Lowercase 'void' is usually preferred. > +{ > + HeapFree(GetProcessHeap(), 0, buffer); It doesn't really make sense to implement it unless we have at least one function which returns a buffer. > +} > + > +ULONG WMIAPI WmiMofEnumerateResourcesA(MOFHANDLE handle, ULONG *count, MOFRESOURCEINFOA **resource) > +{ > + FIXME(": %p %p %p stub\n", handle, count, *resource); Why do you dereference the pointer here? It looks like count and resource are output parameters here. > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiMofEnumerateResourcesW(MOFHANDLE handle, ULONG *count, MOFRESOURCEINFOW **resource) > +{ > + FIXME(": %p %p %p stub\n", handle, count, *resource); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiNotificationRegistrationA(GUID *guid, BOOLEAN enable, void *info, ULONG_PTR *context, ULONG flags) > +{ > + FIXME(": %p %u %p %p 0x%08x stub\n", guid, enable, info, context, flags); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiNotificationRegistrationW(GUID *guid, BOOLEAN enable, void *info, ULONG_PTR *context, ULONG flags) > +{ > + FIXME(": %p %u %p %p 0x%08x stub\n", guid, enable, info, context, flags); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiQueryAllDataA(WMIHANDLE handle, ULONG *buffersize, void *buffer) > +{ > + FIXME(": %p %p %p stub\n", handle, buffersize, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiQueryAllDataW(WMIHANDLE handle, ULONG *buffersize, void *buffer) > +{ > + FIXME(": %p %p %p stub\n", handle, buffersize, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiQueryGuidInformation(WMIHANDLE handle, WMIGUIDINFORMATION *guidinfo) > +{ > + FIXME(": %p %p stub\n", handle, guidinfo); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiSetSingleInstanceA(WMIHANDLE handle, const CHAR *name, ULONG reserved, ULONG size, void *buffer) > +{ > + FIXME(": %p %s %u %u %p stub\n", handle, debugstr_a(name), reserved, size, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiSetSingleInstanceW(WMIHANDLE handle, const WCHAR *name, ULONG reserved, ULONG size, void *buffer) > +{ > + FIXME(": %p %s %u %u %p stub\n", handle, debugstr_w(name), reserved, size, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiSetSingleItemA(WMIHANDLE handle, const CHAR *name, ULONG id, ULONG reserved, ULONG size, void *buffer) > +{ > + FIXME(": %p %s %u %u %p stub\n", handle, debugstr_a(name), reserved, size, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiSetSingleItemW(WMIHANDLE handle, const WCHAR *name, ULONG id, ULONG reserved, ULONG size, void *buffer) > +{ > + FIXME(": %p %s %u %u %p stub\n", handle, debugstr_w(name), reserved, size, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > -- 2.7.3 > > >

1 0

Re: (1/2) include/ddk: add wmium.h
by Sebastian Lackner 06 May '16

06 May '16

On 04.05.2016 06:45, Austin English wrote: > This is from the XP DDK. > > For https://bugs.winehq.org/show_bug.cgi?id=37429 > > -- -Austin > > > 0001-include-add-wmium.h.patch > > > From 2f6b569db167a01c074d7655b2a285db313a5d83 Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Tue, 3 May 2016 00:59:30 -0500 > Subject: [PATCH] include: add wmium.h > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > include/Makefile.in | 1 + > include/wmium.h | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 120 insertions(+) > create mode 100644 include/wmium.h > > diff --git a/include/Makefile.in b/include/Makefile.in > index 250166d..a9e0565 100644 > --- a/include/Makefile.in > +++ b/include/Makefile.in > @@ -666,6 +666,7 @@ HEADER_SRCS = \ > winver.h \ > wlanapi.h \ > wmistr.h \ > + wmium.h \ > wnaspi32.h \ > wownt32.h \ > ws2def.h \ > diff --git a/include/wmium.h b/include/wmium.h > new file mode 100644 > index 0000000..b69f205 > --- /dev/null > +++ b/include/wmium.h > @@ -0,0 +1,119 @@ > +/* > + * Copyright (C) 2016 Austin English > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > +#ifndef _WMIUM_ > +#define _WMIUM_ > + > +#define WMIAPI DECLSPEC_IMPORT __stdcall There should be an #ifdef, DECLSPEC_IMPORT should not be added for the implementation itself. > + > +#include <guiddef.h> > +#include <basetsd.h> > +#include <wmistr.h> > + > +typedef PVOID WMIHANDLE, *PWMIHANDLE, MOFHANDLE, *PMOFHANDLE; > + > +#define MOFCI_reserved0 0x00000001 > +#define MOFCI_reserved1 0x00000002 > +#define MOFCI_reserved2 0x00000004 > + > +typedef struct > +{ > + char *ImagePath; Shouldn't this be a WCHAR pointer? > + WCHAR *ResourceName; > + ULONG ResourceSize; > + UCHAR *Resourcebuffer; > +} MOFRESOURCEINFOW, *PMOFRESOURCEINFOW; > + > +typedef struct > +{ > + char *ImagePath; > + char *ResourceName; > + ULONG ResourceSize; > + UCHAR *Resourcebuffer; > +} MOFRESOURCEINFOA, *PMOFRESOURCEINFOA; > + > +#ifdef UNICODE > +typedef MOFRESOURCEINFOW MOFRESOURCEINFO; > +typedef PMOFRESOURCEINFOW PMOFRESOURCEINFO; > +#else > +typedef MOFRESOURCEINFOA MOFRESOURCEINFO; > +typedef PMOFRESOURCEINFOA PMOFRESOURCEINFO; > +#endif > + > +#ifdef __cplusplus > +extern "C" { > +#endif > + > +#define NOTIFICATION_TRACE_FLAG 0x00010000 > +#define NOTIFICATION_CALLBACK_DIRECT 0x00000004 > +#define NOTIFICATION_CHECK_ACCESS 0x00000008 > + > +typedef void (WINAPI *NOTIFICATIONCALLBACK)(WNODE_HEADER *Wnode, UINT_PTR NotificationContext); There is no need to keep the original parameter names here. > + > +typedef struct _WMIGUIDINFORMATION > +{ > + ULONG Size; > + BOOLEAN IsExpensive; > + BOOLEAN IsEventOnly; > +} WMIGUIDINFORMATION, *PWMIGUIDINFORMATION; > + > +DEFINE_GUID(GUID_REGISTRATION_CHANGE_NOTIFICATION, 0xb48d49a1, 0xe777, 0x11d0, 0xa5, 0xc, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0x10); > +DEFINE_GUID(GUID_MOF_RESOURCE_ADDED_NOTIFICATION, 0xb48d49a2, 0xe777, 0x11d0, 0xa5, 0xc, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0x10); > +DEFINE_GUID(GUID_MOF_RESOURCE_REMOVED_NOTIFICATION, 0xb48d49a3, 0xe777, 0x11d0, 0xa5, 0xc, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0x10); > + > +ULONG WMIAPI WmiCloseBlock(WMIHANDLE handle); > +ULONG WMIAPI WmiDevInstTonameA(char *instance, ULONG length, char *dev, ULONG index); > +ULONG WMIAPI WmiDevInstTonameW(WCHAR *instance, ULONG length, WCHAR *dev, ULONG index); Those two functions above do not exist in any of my header files. Did you maybe mean WmiDevInstToInstanceNameA/W ? > +ULONG WMIAPI WmiEnumerateGuids(LPGUID list, ULONG *count); > +ULONG WMIAPI WmiExecuteMethodA(WMIHANDLE handle, const char *instance, ULONG method, ULONG inputsize, > + void *inputbuffer, ULONG *outputsize, void *outputbuffer); > +ULONG WMIAPI WmiExecuteMethodW(WMIHANDLE handle, const WCHAR *instance, ULONG method, ULONG inputsize, > + void *inputbuffer, ULONG *outputsize, void *outputbuffer); > +ULONG WMIAPI WmiFileHandleTonameA(WMIHANDLE handle, HANDLE filehandle, ULONG *num, char *names); > +ULONG WMIAPI WmiFileHandleTonameW(WMIHANDLE handle, HANDLE filehandle, ULONG *num, WCHAR *names); Those two functions also not exist. Did you mean WmiFileHandleToInstanceNameA/W? > +void WMIAPI WmiFreeBuffer(void *buffer); > +#define WmiInsertTimestamp(WnodeHeader) GetSystemTimeAsFileTime((FILETIME *)&((*WNODE_HEADER)WnodeHeader)->TimeStamp) > +ULONG WMIAPI WmiMofEnumerateResourcesA(MOFHANDLE handle, ULONG *count, PMOFRESOURCEINFOA *resource); > +ULONG WMIAPI WmiMofEnumerateResourcesW(MOFHANDLE handle, ULONG *count, PMOFRESOURCEINFOW *resource); > +ULONG WMIAPI WmiNotificationRegistrationA(LPGUID guid, BOOLEAN enable, void *info, ULONG_PTR context, ULONG flags); > +ULONG WMIAPI WmiNotificationRegistrationW(LPGUID guid, BOOLEAN enable, void *info, ULONG_PTR context, ULONG flags); > +ULONG WMIAPI WmiOpenBlock(GUID *guid, ULONG access, WMIHANDLE *handle); > +ULONG WMIAPI WmiQueryAllDataA(WMIHANDLE handle, ULONG *bufferSize, void *buffer); > +ULONG WMIAPI WmiQueryAllDataW(WMIHANDLE handle, ULONG *buffferSize, void *buffer); > +ULONG WMIAPI WmiQueryGuidInformation(WMIHANDLE handle, PWMIGUIDINFORMATION guidinfo); > +ULONG WMIAPI WmiQuerySingleInstanceA(WMIHANDLE handle, const char *name, ULONG *bufferSize, void *buffer); > +ULONG WMIAPI WmiQuerySingleInstanceW(WMIHANDLE handle, const WCHAR *name, ULONG *bufferSize, void *buffer); > +ULONG WMIAPI WmiSetSingleInstanceA(WMIHANDLE handle, const char *name, ULONG reserved, ULONG size, void *buffer); > +ULONG WMIAPI WmiSetSingleInstanceW(WMIHANDLE handle, const WCHAR *name, ULONG reserved, ULONG size, void *buffer); > +ULONG WMIAPI WmiSetSingleItemA(WMIHANDLE handle, const char *name, ULONG id, ULONG reserved, ULONG size, void *buffer); > +ULONG WMIAPI WmiSetSingleItemW(WMIHANDLE handle, const WCHAR *name, ULONG id, ULONG reserved, ULONG size, void *buffer); > + > +DECL_WINELIB_TYPE_AW(WmiDevInstToname) > +DECL_WINELIB_TYPE_AW(WmiExecuteMethod) > +DECL_WINELIB_TYPE_AW(WmiFileHandleToname) > +DECL_WINELIB_TYPE_AW(WmiMofEnumerateResources) > +DECL_WINELIB_TYPE_AW(WmiNotificationRegistration) > +DECL_WINELIB_TYPE_AW(WmiQueryAllData) > +DECL_WINELIB_TYPE_AW(WmiQuerySingleInstance) > +DECL_WINELIB_TYPE_AW(WmiSetSingleInstance) > +DECL_WINELIB_TYPE_AW(WmiSetSingleItem) > + > +#ifdef __cplusplus > +} > +#endif > + > +#endif /* _WMIUM_ */ > -- 2.7.3 > > >

1 0

GPU detection logic in wined3d
by Ken Thomases 05 May '16

05 May '16

Hi, Now that the WGL_WINE_query_renderer extension is implemented for Mesa and OS X, I want to reconsider the logic for detecting the GPU in wined3d. See wined3d_adapter_init_gl_caps() and query_gpu_description() in dlls/wined3d/directx.c. First, let's assume that query_renderer is available and the user has not overridden the vendor or device IDs via the registry: If query_renderer provides vendor and device IDs, I think that those should carry a lot of weight. They are almost certainly the real values. So, if that combination isn't found in wined3d's tables, it should emit a winediag ERR. We want to update the tables to account for the devices, especially for Macs where there are relatively few GPUs and they're common to a lot of machines. Currently, the failure to find them is just silently ignored. If the combination isn't found or if query_renderer provided a vendor but no device, and the vendor is one of the known ones (i.e. from card_vendor_table), then it should be used to constrain the guessing. Wined3d should not attempt to guess the vendor. Currently, the vendor provided by query_renderer is just ignored in that case. If query_renderer provides a device ID but no vendor, then that's basically useless and should be ignored. If the user has overridden both the vendor and device in the registry but that combination is not in the tables, then we should go back to the values from query_renderer. Basically, this is user error to specify useless values in the override and it should be ignored. Currently, the overrides replace the values from query_renderer and they are lost. If the user has overridden just the vendor, then it should be used iff it's one of the known ones. This is the user telling us the vendor of their GPU. If it doesn't match the vendor provided by query_renderer, then any device provided by query_renderer should be ignored. It doesn't make sense to combine a device ID from one vendor with a different vendor. Wined3d will have to guess the device. If the user has overridden just the device, then it should be used with the vendor from query_renderer. If that combination is not found, then it should be ignored. The user presumably saw on some previous occasion that wined3d determined the right vendor but the wrong device and just corrected the device. If the combination is not found, then either the vendor has changed or the user did it wrong by specifying a device that's not known to wined3d. If people (mostly Henri) generally like the above proposed logic, I can work up a patch. -Ken

1 0

Wine Gecko 2.47-beta1
by Jacek Caban 05 May '16

05 May '16

Hi all, I just uploaded a beta build of the next Gecko update. Wine patch is attached. All reviews and testing is appreciated. Thanks, Jacek

1 0

Re: [1/2] shlwapi/tests: Add wvnsprintfW comformance test
by Marvin 05 May '16

05 May '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22849 Your paranoid android. === wxppro (32 bit string) === string: unhandled exception c0000005 at 77F6923B === w2003std (32 bit string) === string: unhandled exception c0000005 at 7D18A782

1 0

Re: [PATCH] winmm: Restrict some MCI actions to the creating thread
by Marvin 04 May '16

04 May '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22848 Your paranoid android. === w864 (32 bit mci) === mci.c:1121: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) === w1064 (32 bit mci) === mci.c:1121: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) === w864 (64 bit mci) === mci.c:1121: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) === w1064 (64 bit mci) === mci.c:1121: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close)

1 0

Re: [PATCH 11/11] msctf: Added ITfTransitoryExtensionSink tests.
by Marvin 04 May '16

04 May '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22847 Your paranoid android. === wvistau64 (32 bit inputprocessor) === inputprocessor.c:1104: Test failed: Failed to get sink cookie === w2008s64 (32 bit inputprocessor) === inputprocessor.c:1104: Test failed: Failed to get sink cookie === w7u (32 bit inputprocessor) === inputprocessor.c:1104: Test failed: Failed to get sink cookie === w7pro64 (32 bit inputprocessor) === inputprocessor.c:1104: Test failed: Failed to get sink cookie === wvistau64 (64 bit inputprocessor) === inputprocessor.c:1104: Test failed: Failed to get sink cookie === w2008s64 (64 bit inputprocessor) === inputprocessor.c:1104: Test failed: Failed to get sink cookie === w7pro64 (64 bit inputprocessor) === inputprocessor.c:1104: Test failed: Failed to get sink cookie

1 0

Re: msctf: Improved ITfKeystrokeMgr::TestKeyUp and TestKeyDown stubs.
by Aric Stewart 04 May '16

04 May '16

Signed-off-by: Aric Stewart <aric(a)codeweavers.com>

1 0

Re: comdlg32: Use SetRect() instead of open coding it.
by Dmitry Timoshkov 04 May '16

04 May '16

Frédéric Delanoy <frederic.delanoy(a)gmail.com> wrote: > - cancel_rc.left = dialog_rc.right - cancel_width - hspacing; > - cancel_rc.top = dialog_rc.bottom - cancel_height - vspacing; > - cancel_rc.right = cancel_rc.left + cancel_width; > - cancel_rc.bottom = cancel_rc.top + cancel_height; > + SetRect(&cancel_rc, > + dialog_rc.right - cancel_width - hspacing, dialog_rc.bottom - cancel_height - vspacing, > + dialog_rc.right - hspacing , dialog_rc.bottom - vspacing); This is at least very strange and weird formatting of an API call. I don't see anything like that in the changed file. -- Dmitry.

3 5

Re: [PATCH 3/4] winemac.drv: Really fix our handling of DIBs on the clipboard.
by Ken Thomases 04 May '16

04 May '16

Hi Chip, Thanks for working on this. I know you didn't originate this approach, but, as a general concern, is there really no better approach to converting DIBs than what we have with duplicated code for manually laying out the structure and copying data? I mean, that code has to go someplace, but shouldn't there be proper functions in GDI or something? Among other things, I worry that there might be subtle details that each duplicate gets slightly wrong or at least different from the others. For one thing, when converting from a DIBv5 to another format, you copy across the image data, but you drop the color profile. Shouldn't there be a color conversion to sRGB or whatever the default profile of a v3 DIB is? I know that most of Wine doesn't handle this stuff properly, anyway, but that's part of my point about doing these conversions in one place. When such support is added to that one place in the future, we'd want to automatically get the benefit of it here. Specific points about the code in-line below. In some cases, I may just be ignorant about the DIB format, so just let me know: On May 3, 2016, at 2:03 PM, Charles Davis <cdavis5x(a)gmail.com> wrote: > > +static HGLOBAL create_dib_from_dibv5(HGLOBAL src) … > + /* Calculate the size of the new packed DIB */ > + data_size = bv5->bV5SizeImage; MSDN says bV5SizeImage can be zero for BI_RGB DIBs. Is that only for zero-size DIBs or does it mean it's implicit in width, height, and bit count? > + packed_size = sizeof(BITMAPINFOHEADER) > + + ((bv5->bV5BitCount <= 8) ? (sizeof(RGBQUAD) * bv5->bV5ClrUsed) : 0) > + + ((bv5->bV5Compression == BI_BITFIELDS) ? (sizeof(DWORD) * 3) : 0) > + + data_size; MSDN says bV5BitCount can be 0 for BI_JPEG and BI_PNG. For that case, should a color table be included in the size? There's an existing function, bitmap_info_size(). Should that be extended for additional header types for its existing uses? Should it be used for these calculations in your new code? > +static HGLOBAL create_dibv5_from_dib(HGLOBAL src) … > + data_size = bmih->biSizeImage; > + packed_size = sizeof(BITMAPV5HEADER) > + + ((bmih->biBitCount <= 8) ? (sizeof(RGBQUAD) * bmih->biClrUsed) : 0) > + + data_size; > + offset_src = bmih->biSize > + + ((bmih->biBitCount <= 8) ? (sizeof(RGBQUAD) * bmih->biClrUsed) : 0); Shouldn't offset_src potentially include the color masks for biCompression == BI_BITFIELDS? > + if (bv5->bV5Compression == BI_BITFIELDS && bmih->biSize < sizeof(BITMAPV4HEADER)) > + { > + memcpy(&bv5->bV5RedMask, bmih+1, 3*sizeof(DWORD)); > + bv5->bV5AlphaMask = 0; > + } Is it OK to leave the masks uninitialized for other cases? > + hdc = GetDC(0); You never release this DC. > + if (GetLogColorSpaceW(GetColorSpace(hdc), &lcs, sizeof(lcs))) > + { > + if (bmih->biSize < sizeof(BITMAPV4HEADER)) > + { > + bv5->bV5CSType = lcs.lcsCSType; > + bv5->bV5Endpoints = lcs.lcsEndpoints; > + bv5->bV5GammaRed = lcs.lcsGammaRed; > + bv5->bV5GammaGreen = lcs.lcsGammaGreen; > + bv5->bV5GammaBlue = lcs.lcsGammaBlue; > + } > + bv5->bV5Intent = lcs.lcsIntent; > + } > + else > + { > + if (bmih->biSize < sizeof(BITMAPV4HEADER)) > + { > + bv5->bV5CSType = LCS_DEVICE_RGB; This type isn't listed as a valid value for bV5CSType in MSDN. > + memset(&bv5->bV5Endpoints, 0, sizeof(bv5->bV5Endpoints)); > + bv5->bV5Endpoints.ciexyzRed.ciexyzX = 0xffffffff; > + bv5->bV5Endpoints.ciexyzGreen.ciexyzY = 0xffffffff; > + bv5->bV5Endpoints.ciexyzBlue.ciexyzZ = 0xffffffff; > + bv5->bV5GammaRed = 0; > + bv5->bV5GammaGreen = 0; > + bv5->bV5GammaBlue = 0; Are gamma values of 0 right? I would expect the 16.16-fixed form of 2.2 or maybe 1.0. > @@ -724,6 +932,7 @@ static HANDLE import_bmp_to_dib(CFDataRef data) > } > > memcpy(p, bmi, len); > + Spurious whitespace change. > @@ -1254,8 +1552,35 @@ static CFDataRef export_bitmap_to_dib(HANDLE data) > dib = create_dib_from_bitmap(data); > if (dib) > { > - ret = export_clipboard_data(dib); > + HGLOBAL dib3 = create_dib_from_dibv5(dib); > + > + ret = export_clipboard_data(dib3); > + GlobalFree(dib); > + if (dib3 != dib) GlobalFree(dib3); > + } Is the above necessary? create_dib_from_bitmap() will only ever create v3 DIBs, right? It's specifically allocating and building a BITMAPINFOHEADER. -Ken

1 0

Re: [PATCH 3/3] wininet: Added IRD_NO_WAIT flag tests.
by Marvin 04 May '16

04 May '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22837 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2413: Test failed: count was wrong http.c:2414: Test failed: http data wrong, got: Garbage: Header http.c:3077: Test failed: HttpAddRequestHeaders succeeded http.c:3078: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3083: Test failed: code = 200, expected 400 http.c:3083: Test failed: unexpected status code 200, expected 400 http.c:3083: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w1064 (64 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2413: Test failed: count was wrong http.c:2414: Test failed: http data wrong, got: Garbage: Header http.c:3077: Test failed: HttpAddRequestHeaders succeeded http.c:3078: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3083: Test failed: code = 200, expected 400 http.c:3083: Test failed: unexpected status code 200, expected 400 http.c:3083: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

1 0

Re: msctf: Improved ITfKeystrokeMgr::TestKeyUp and TestKeyDown stubs.
by Marvin 04 May '16

04 May '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22836 Your paranoid android. === wvistau64 (32 bit inputprocessor) === inputprocessor.c:254: Test failed: Unexpected TextStoreACP_RequestLock sink inputprocessor.c:275: Test failed: Unexpected TextStoreACP_GetSelection sink inputprocessor.c:1241: Test failed: eaten = 1 === w2008s64 (32 bit inputprocessor) === inputprocessor.c:254: Test failed: Unexpected TextStoreACP_RequestLock sink inputprocessor.c:275: Test failed: Unexpected TextStoreACP_GetSelection sink inputprocessor.c:1241: Test failed: eaten = 1 === w864 (32 bit inputprocessor) === inputprocessor.c:793: Test failed: Deactivation came unexpectedly === wvistau64 (64 bit inputprocessor) === inputprocessor.c:254: Test failed: Unexpected TextStoreACP_RequestLock sink inputprocessor.c:275: Test failed: Unexpected TextStoreACP_GetSelection sink inputprocessor.c:1241: Test failed: eaten = 1 === w2008s64 (64 bit inputprocessor) === inputprocessor.c:254: Test failed: Unexpected TextStoreACP_RequestLock sink inputprocessor.c:275: Test failed: Unexpected TextStoreACP_GetSelection sink inputprocessor.c:1241: Test failed: eaten = 1

1 0

Re: winex11.drv: Use IsRectEmpty() instead of open coding it.
by Alexandre Julliard 04 May '16

04 May '16

Michael Stefaniuc <mstefani(a)redhat.de> writes: > @@ -134,7 +134,7 @@ static inline void reset_bounds( RECT *bounds ) > > static inline void add_bounds_rect( RECT *bounds, const RECT *rect ) > { > - if (rect->left >= rect->right || rect->top >= rect->bottom) return; > + if (IsRectEmpty(rect)) return; I'm not sure it's an improvement to add a function call in such a simple inline function. -- Alexandre Julliard julliard(a)winehq.org

3 4

Re: [PATCH 2/4] winemac.drv: Move create_bitmap_from_dib() above the import/export functions.
by Ken Thomases 04 May '16

04 May '16

Signed-off-by: Ken Thomases <ken(a)codeweavers.com>

1 0

Re: winemac.drv: Use IsRectEmpty() instead of open coding it.
by Ken Thomases 04 May '16

04 May '16

On May 3, 2016, at 2:47 PM, Michael Stefaniuc <mstefani(a)redhat.de> wrote: > > Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> > --- > Not even compile tested. But as this is a purely generated patch there > was no opportunity for me to screw it up... In fact, it doesn't compile. :-/ You've added a call to IsRectEmpty() to macdrv.h, which doesn't #include winuser.h. That alone only causes an implicit declaration warning. However, clipboard.c includes winuser.h after macdrv.h, which causes an error about the conflict between the real and implicit declarations. You can move the include of winuser.h from all of the modules to macdrv.h, but make sure to #define OEMRESOURCE before it, as required by mouse.c. It also seems to need to come after the include of wingdi.h. -Ken > > > > dlls/winemac.drv/macdrv.h | 2 +- > dlls/winemac.drv/window.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h > index f3b5e65..81b642c 100644 > --- a/dlls/winemac.drv/macdrv.h > +++ b/dlls/winemac.drv/macdrv.h > @@ -47,7 +47,7 @@ > > static inline CGRect cgrect_from_rect(RECT rect) > { > - if (rect.left >= rect.right || rect.top >= rect.bottom) > + if (IsRectEmpty(&rect)) > return CGRectMake(rect.left, rect.top, 0, 0); > return CGRectMake(rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top); > } > diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c > index a48ac17..fbea49f 100644 > --- a/dlls/winemac.drv/window.c > +++ b/dlls/winemac.drv/window.c > @@ -401,7 +401,7 @@ static void sync_window_region(struct macdrv_win_data *data, HRGN win_region) > */ > static inline void add_bounds_rect(RECT *bounds, const RECT *rect) > { > - if (rect->left >= rect->right || rect->top >= rect->bottom) return; > + if (IsRectEmpty(rect)) return; > bounds->left = min(bounds->left, rect->left); > bounds->top = min(bounds->top, rect->top); > bounds->right = max(bounds->right, rect->right); > -- > 2.4.11 > >

1 0

Re: ntdll: Fix buffer allocation check in get_dir_data_space.
by Alexandre Julliard 04 May '16

04 May '16

Sebastian Lackner <sebastian(a)fds-team.de> writes: > BTW: I assume its intentional that you realloc only the first buffer to release > some space, right? In the worst case we are wasting up to about > PATH_MAX * sizeof(WCHAR) space in the other buffers. Yes, in the common case it will only waste a few bytes. It's only the last buffer that can have significant space left. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: dbghelp: Fix a typo in comment
by Frédéric Delanoy 04 May '16

04 May '16

Minor thing, but you wanna keep "*/" alignment consistent by adding a space. On Tue, May 3, 2016 at 4:01 PM, Andrey Gusev <andrey.goosev(a)gmail.com> wrote: > @@ -58,7 +58,7 @@ > /* order from highest-order term to lowest-order term. UARTs transmit */ > /* characters in order from LSB to MSB. By storing the CRC this way, */ > /* we hand it to the UART in the order low-byte to high-byte; the UART */ > -/* sends each low-bit to hight-bit; and the result is transmission bit */ > +/* sends each low-bit to high-bit; and the result is transmission bit */ > /* by bit from highest- to lowest-order term without requiring any bit */ > /* shuffling on our part. Reception works similarly. */ -- Frédéric Delanoy

1 0

Re: user32/tests: Don't test function directly when reporting GetLastError()
by Marvin 03 May '16

03 May '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22828 Your paranoid android. === wvistau64 (64 bit win) === win.c:8154: Test failed: transparent window didn't get WM_NCHITTEST message win.c:8155: Test failed: button under static window didn't get WM_LBUTTONUP

1 0

Re: [PATCH 3/4] d3drm: Implement IDirect3DRM*_CreateTexture. (v2)
by Aaryaman Vasishta 03 May '16

03 May '16

Please take a look at v2 of this patch and v2 of patch 2/4. 1/4 and 4/4 are there as well but are way down the list so should I resend the whole patch set instead? Cheers Aaryaman On Sat, Apr 30, 2016 at 4:54 PM, Aaryaman Vasishta < jem456.vasishta(a)gmail.com> wrote: > Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > --- > dlls/d3drm/d3drm.c | 37 ++++++++++++++++++++--------- > dlls/d3drm/tests/d3drm.c | 61 > ++++++++++++++++++++++++++++++++++++++++++++---- > dlls/d3drm/texture.c | 2 +- > 3 files changed, 83 insertions(+), 17 deletions(-) > > diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c > index 2b428ef..6c6007d 100644 > --- a/dlls/d3drm/d3drm.c > +++ b/dlls/d3drm/d3drm.c > @@ -195,17 +195,19 @@ static HRESULT WINAPI > d3drm1_CreateAnimationSet(IDirect3DRM *iface, IDirect3DRMA > static HRESULT WINAPI d3drm1_CreateTexture(IDirect3DRM *iface, > D3DRMIMAGE *image, IDirect3DRMTexture **texture) > { > - struct d3drm_texture *object; > + struct d3drm *d3drm = impl_from_IDirect3DRM(iface); > + IDirect3DRMTexture3 *texture3; > HRESULT hr; > > - FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, > texture); > + TRACE("iface %p, image %p, texture %p.\n", iface, image, texture); > > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (FAILED(hr = > IDirect3DRM3_CreateTexture(&d3drm->IDirect3DRM3_iface, image, &texture3))) > return hr; > > - *texture = &object->IDirect3DRMTexture_iface; > + hr = IDirect3DRMTexture3_QueryInterface(texture3, > &IID_IDirect3DRMTexture, (void **)texture); > + IDirect3DRMTexture3_Release(texture3); > > - return D3DRM_OK; > + return hr; > } > > static HRESULT WINAPI d3drm1_CreateLight(IDirect3DRM *iface, > @@ -661,17 +663,19 @@ static HRESULT WINAPI > d3drm2_CreateAnimationSet(IDirect3DRM2 *iface, IDirect3DRM > static HRESULT WINAPI d3drm2_CreateTexture(IDirect3DRM2 *iface, > D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) > { > - struct d3drm_texture *object; > + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); > + IDirect3DRMTexture3 *texture3; > HRESULT hr; > > - FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, > texture); > + TRACE("iface %p, image %p, texture %p.\n", iface, image, texture); > > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (FAILED(hr = > IDirect3DRM3_CreateTexture(&d3drm->IDirect3DRM3_iface, image, &texture3))) > return hr; > > - *texture = &object->IDirect3DRMTexture2_iface; > + hr = IDirect3DRMTexture3_QueryInterface(texture3, > &IID_IDirect3DRMTexture2, (void **)texture); > + IDirect3DRMTexture3_Release(texture3); > > - return D3DRM_OK; > + return hr; > } > > static HRESULT WINAPI d3drm2_CreateLight(IDirect3DRM2 *iface, > @@ -1152,13 +1156,24 @@ static HRESULT WINAPI > d3drm3_CreateAnimationSet(IDirect3DRM3 *iface, IDirect3DRM > static HRESULT WINAPI d3drm3_CreateTexture(IDirect3DRM3 *iface, > D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) > { > + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); > struct d3drm_texture *object; > HRESULT hr; > > - FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, > texture); > + TRACE("iface %p, image %p, texture %p.\n", iface, image, texture); > + > + if (!d3drm_validate_image(image)) > + return D3DRMERR_BADVALUE; > > if (FAILED(hr = d3drm_texture_create(&object))) > return hr; > + object->d3drm = &d3drm->IDirect3DRM_iface; > + > + if (FAILED(hr = > IDirect3DRMTexture3_InitFromImage(&object->IDirect3DRMTexture3_iface, > image))) > + { > + d3drm_texture_destroy(object); > + return hr; > + } > > *texture = &object->IDirect3DRMTexture3_iface; > > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 2a70ca4..3a32e6d 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -1725,11 +1725,62 @@ static void test_Texture(void) > hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void > **)&d3drm3); > ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", > hr); > > + /* Tests for validation of D3DRMIMAGE struct */ > + hr = IDirect3DRM_CreateTexture(d3drm1, &testimg, &texture1); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = > %x)\n", hr); > + hr = IDirect3DRM2_CreateTexture(d3drm2, &testimg, &texture2); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = > %x)\n", hr); > + hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = > %x)\n", hr); > + IDirect3DRMTexture_Release(texture1); > + IDirect3DRMTexture2_Release(texture2); > + IDirect3DRMTexture3_Release(texture3); > + > + initimg.rgb = 0; > + hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + initimg.rgb = 1; > + initimg.red_mask = 0; > + hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + initimg.red_mask = 0x000000ff; > + initimg.green_mask = 0; > + hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + initimg.green_mask = 0x0000ff00; > + initimg.blue_mask = 0; > + hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + initimg.blue_mask = 0x00ff0000; > + initimg.buffer1 = NULL; > + hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + > initimg.buffer1 = &pixel; > hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); > ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = > %x)\n", hr); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 > = %u.\n", ref1, ref2); > + ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", > ref1, ref2); > ref3 = get_refcount((IUnknown *)d3drm2); > ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = > %u.\n", ref1, ref3); > ref4 = get_refcount((IUnknown *)d3drm3); > @@ -1737,7 +1788,7 @@ static void test_Texture(void) > hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2); > ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = > %x)\n", hr); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 > ref1 + 1, "expected ref2 > ref1, got ref1 = %u , > ref2 = %u.\n", ref1, ref2); > + ok(ref2 > ref1 + 1, "expected ref2 > (ref1 + 1), got ref1 = %u , ref2 > = %u.\n", ref1, ref2); > ref3 = get_refcount((IUnknown *)d3drm2); > ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = > %u.\n", ref1, ref3); > ref4 = get_refcount((IUnknown *)d3drm3); > @@ -1745,7 +1796,7 @@ static void test_Texture(void) > hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3); > ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = > %x)\n", hr); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 > ref1 + 2, "expected ref2 > ref1, got ref1 = %u , > ref2 = %u.\n", ref1, ref2); > + ok(ref2 > ref1 + 2, "expected ref2 > (ref1 + 2), got ref1 = %u , ref2 > = %u.\n", ref1, ref2); > ref3 = get_refcount((IUnknown *)d3drm2); > ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = > %u.\n", ref1, ref3); > ref4 = get_refcount((IUnknown *)d3drm3); > @@ -1803,7 +1854,7 @@ static void test_Texture(void) > > IDirect3DRMTexture_Release(texture1); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 - 2 == ref1, "expected ref2 == ref1, got ref1 = %u, > ref2 = %u.\n", ref1, ref2); > + ok(ref2 - 2 == ref1, "expected (ref2 - 2) == ref1, got ref1 = %u, > ref2 = %u.\n", ref1, ref2); > ref3 = get_refcount((IUnknown *)d3drm2); > ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = > %u.\n", ref1, ref3); > ref4 = get_refcount((IUnknown *)d3drm3); > @@ -1827,7 +1878,7 @@ static void test_Texture(void) > > IDirect3DRMTexture2_Release(texture2); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 - 1 == ref1, "expected ref2 == ref1, got ref1 = %u, > ref2 = %u.\n", ref1, ref2); > + ok(ref2 - 1 == ref1, "expected (ref2 - 1) == ref1, got ref1 = %u, > ref2 = %u.\n", ref1, ref2); > ref3 = get_refcount((IUnknown *)d3drm2); > ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = > %u.\n", ref1, ref3); > ref4 = get_refcount((IUnknown *)d3drm3); > diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c > index 7db3ecd..883be82 100644 > --- a/dlls/d3drm/texture.c > +++ b/dlls/d3drm/texture.c > @@ -46,7 +46,7 @@ static inline struct d3drm_texture > *impl_from_IDirect3DRMTexture3(IDirect3DRMTex > > void d3drm_texture_destroy(struct d3drm_texture *texture) > { > - if (texture->d3drm && texture->initialized) > + if (texture->initialized) > IDirect3DRM_Release(texture->d3drm); > HeapFree(GetProcessHeap(), 0, texture); > } > -- > 2.3.2 (Apple Git-55) > >

1 0

Re: mode: add stub exe
by Nikolay Sivov 03 May '16

03 May '16

> +MODULE = mode.exe I don't know how important that is, but on Win7 it's called mode.com, just what bug title says. > @@ -3472,6 +3472,7 @@ WINE_CONFIG_PROGRAM(iexplore,,[install]) > WINE_CONFIG_PROGRAM(ipconfig,,[clean,install]) > WINE_CONFIG_PROGRAM(lodctr,,[install]) > WINE_CONFIG_PROGRAM(mofcomp,,[install]) > +WINE_CONFIG_PROGRAM(mode,,[install]) > WINE_CONFIG_PROGRAM(mshta,,[install]) > WINE_CONFIG_PROGRAM(msiexec,,[install,installbin,manpage]) > WINE_CONFIG_PROGRAM(net,,[clean,install]) This is not sorted.

2 1

Re: [1/2] kernel32/tests: Add more tests for GetConsoleFontInfo. (v4)
by Marvin 03 May '16

03 May '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22804 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 1301662830 console.c:1445: Test failed: [15] Expected output count to be 0, got 1301662830 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 1301662830 console.c:1689: Test failed: [13] Expected output count to be 0, got 1301662830 console.c:1689: Test failed: [15] Expected output count to be 0, got 1301662830 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 1301662830 === w864 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 3495556664 console.c:1445: Test failed: [15] Expected output count to be 0, got 3495556664 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3495556664 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 3495556664 console.c:1689: Test failed: [15] Expected output count to be 0, got 3495556664 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3495556664 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 4206877851 console.c:1445: Test failed: [15] Expected output count to be 0, got 4206877851 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 4206877851 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 4206877851 console.c:1689: Test failed: [15] Expected output count to be 0, got 4206877851 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 4206877851 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w864 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

2 1

Re: [2/2] kernel32/tests: Add tests for SetConsoleFont. (resend)
by Marvin 03 May '16

03 May '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22805 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 3667173890 console.c:1445: Test failed: [15] Expected output count to be 0, got 3667173890 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3667173890 console.c:1689: Test failed: [13] Expected output count to be 0, got 3667173890 console.c:1689: Test failed: [15] Expected output count to be 0, got 3667173890 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3667173890 === w864 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 125638792 console.c:1445: Test failed: [15] Expected output count to be 0, got 125638792 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 125638792 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 125638792 console.c:1689: Test failed: [15] Expected output count to be 0, got 125638792 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 125638792 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 62984337 console.c:1445: Test failed: [15] Expected output count to be 0, got 62984337 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 62984337 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 62984337 console.c:1689: Test failed: [15] Expected output count to be 0, got 62984337 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 62984337 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w864 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

1 0

ntdll: Store the directory identity and search mask in the directory cache
by Piotr Caban 02 May '16

02 May '16

The patch breaks compilation on mac: directory.c:1973:42: error: expected identifier if (!has_wildcard( dir_data->->mask )) break; ^ directory.c:2164:34: error: use of undeclared identifier 'dir_data' const UNICODE_STRING *mask = dir_data->mask; ^ directory.c:2216:61: error: use of undeclared identifier 'dir_data' union file_directory_info *info = append_entry( dir_data, bu... Thanks, Piotr

1 1

Re: [PATCH] comctl32/tooltips: Cut tooltip text at first tab char unless TTS_NOPREFIX is used
by Dmitry Timoshkov 02 May '16

02 May '16

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > @@ -316,49 +318,40 @@ static void test_gettext(void) > toolinfoA.lParam = 0xdeadbeef; > GetClientRect(hwnd, &toolinfoA.rect); > r = SendMessageA(hwnd, TTM_ADDTOOLA, 0, (LPARAM)&toolinfoA); > - if (r) > - { > - toolinfoA.hwnd = NULL; > - toolinfoA.uId = 0x1234ABCD; > - toolinfoA.lpszText = bufA; > - SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); > - ok(strcmp(toolinfoA.lpszText, "") == 0, "lpszText should be an empty string\n"); > > - toolinfoA.lpszText = bufA; > - SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); > - ok(toolinfoA.lpszText == NULL, > - "expected NULL, got %p\n", toolinfoA.lpszText); 'r' is assigned but not used. Perhaps it would be a good idea to test return value of every SendMessage() call. -- Dmitry.

1 0

Re: dwmapi: Return S_OK in DwmSetWindowAttribute stub.
by Nikolay Sivov 02 May '16

02 May '16

On 02.05.2016 16:06, Sebastian Lackner wrote: > From: Michael Müller <michael(a)fds-team.de> > > Signed-off-by: Michael Müller <michael(a)fds-team.de> > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > dlls/dwmapi/dwmapi_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c > index 155d7d3..8c3472a 100644 > --- a/dlls/dwmapi/dwmapi_main.c > +++ b/dlls/dwmapi/dwmapi_main.c > @@ -126,7 +126,7 @@ HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attr > > if (!once++) FIXME("(%p, %x, %p, %x) stub\n", hwnd, attributenum, attribute, size); > > - return E_NOTIMPL; > + return S_OK; > } > > /********************************************************************** > What application is that for?

2 1

Re: [PATCH 2/2 v2] mshtml: Make it possible to clear timer and interval with any of clearTimeout and clearInterval functions
by Marvin 02 May '16

02 May '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22785 Your paranoid android. === wxppro (32 bit events) === events.c:1388: timeout The test timed out === w2003std (32 bit events) === events.c:1388: timeout The test timed out === wvistau64 (32 bit events) === events.c:1388: timeout The test timed out === w2008s64 (32 bit events) === events.c:1388: timeout === w7u (32 bit events) === events.c:1388: timeout === w7pro64 (32 bit events) === events.c:1388: timeout === w8 (32 bit events) === events.c:1388: timeout === w864 (32 bit events) === events.c:1388: timeout events.c:1388: timeout === w1064 (32 bit events) === events.c:1388: timeout events.c:1388: timeout === wvistau64 (64 bit events) === events.c:1388: timeout === w2008s64 (64 bit events) === events.c:1388: timeout === w7pro64 (64 bit events) === events.c:1388: timeout === w864 (64 bit events) === events.c:1388: timeout events.c:1388: timeout === w1064 (64 bit events) === events.c:1388: timeout events.c:1388: timeout

1 0

Re: [PATCH 1/2 v2] mshtml: Fix HTMLWindow3_setInterval behavior on 0 msec intervals
by Marvin 02 May '16

02 May '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22784 Your paranoid android. === wxppro (32 bit events) === events.c:1388: timeout === w2003std (32 bit events) === events.c:1388: timeout === wvistau64 (32 bit events) === events.c:1388: timeout === w2008s64 (32 bit events) === events.c:1388: timeout === w7u (32 bit events) === events.c:1388: timeout === w7pro64 (32 bit events) === events.c:1388: timeout === w8 (32 bit events) === events.c:1388: timeout === w864 (32 bit events) === events.c:1388: timeout events.c:1388: timeout === w1064 (32 bit events) === events.c:1388: timeout events.c:1388: timeout === wvistau64 (64 bit events) === events.c:1388: timeout === w2008s64 (64 bit events) === events.c:1388: timeout === w7pro64 (64 bit events) === events.c:1388: timeout === w864 (64 bit events) === events.c:1388: timeout events.c:1388: timeout === w1064 (64 bit events) === events.c:1388: timeout events.c:1388: timeout

1 0

Re: [PATCH] po: update Norwegian translation
by Nikolay Sivov 02 May '16

02 May '16

On 30.04.2016 17:18, Kim Malmo wrote: > I have added missing translations and fixed up the fuzzy ones. I've also > fixed some minor typos and spelling errors in the old translation. > > The undertaking that might stand out here however, is I've tried to make > it more consistent with itself, and more consistent with the original > english text. One thing I want to point out is the (former) usage of > « and » signs. First of all the are no longer present on Norwegian > keyboards, second and perhaps most importantly, they look hideous with > whatever is the default Wine font. For consistency what I've done is the > following: > > * For %1 (or similar) in the english text I have used %1 or '%1' depending > on context. In some cases it makes sense to wrap handles or operations > in Norwegian. > > * For '%1' (or similar) in the english text I have used '%1' > > * All cases of «%1» (or similar) has been changed to %1 or '%1' depending > on context. > > For parts of the translation I have tried to make the context and meaning > more clear. There are also quite a few changes to make it more conformant > with Microsoft's Norwegian Bokmål Style Guide. Hi, thank you for this major update. Regarding quotation marks, it's really up to target language to use one of several styles of quotation marks and quotation formatting. Original English text is only a reference, not something to follow. User guide you mentioned, mostly tells to omit quotation marks (p. 58), and use straight double quotes if they are necessary. The fact that '«' and '»' are missing from default keyboard layout is unfortunate but can't alone be a reason not to use them, if traditional typographical rules tell so. What about default Wine font problems with them? I see no such thing when testing in clean prefix, but it could certainly depend on dpi/font size (Wine's Tahoma is simplistic) and actual font you're using. > > Signed-off-by: Kim Malmo <berencamlost(a)msn.com>

3 3

Re: [v2 1/2] d3dx9: Add 'exp' preshader opcode.
by Matteo Bruni 01 May '16

01 May '16

2016-04-25 10:52 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > + op_step = 2 + (args_count + 1) * 3; You could instead calculate that in the caller and pass it in place of args_count. Or, probably better, you could pass the entire op_tests[] table entry to the function, you're currently passing all the fields one by one anyway. > + for (i = 0; i < 4; ++i) > + todo_wine_if(todo && todo[i]) > + ok(compare_float(v[i], ((float *)expected_result)[i], ulps), > + "Operation %s, component %u, expected %#x (%g), got %#x (%g).\n", op_mnem, > + i, expected_result[i], ((float *)expected_result)[i], ((unsigned int *)v)[i], v[i]); todo currently can never be NULL. > + for (i = 0; i < ARRAY_SIZE(op_tests); ++i) > + test_preshader_op(device, test_effect_preshader_effect_blob, sizeof test_effect_preshader_effect_blob, > + blob_position[op_tests[i].args_count].pos, blob_position[op_tests[i].args_count].result_index, > + op_tests[i].mnem, op_tests[i].opcode, op_tests[i].args_count, > + op_tests[i].expected_result, &op_tests[i].fvect1, &op_tests[i].fvect2, > + op_tests[i].ulps, op_tests[i].todo); Parenthesis around sizeof operand, please.

1 0

Re: [PATCH 1/2] d3dx9: Add 'exp' preshader opcode.
by Matteo Bruni 01 May '16

01 May '16

2016-04-21 10:56 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > @@ -43,6 +43,7 @@ enum pres_ops > PRESHADER_OP_SIN, > PRESHADER_OP_COS, > PRESHADER_OP_RSQ, > + PRESHADER_OP_EXP, > }; > #define PRES_OPCODE_MASK 0x7ff00000 > #define PRES_OPCODE_SHIFT 20 > @@ -119,6 +121,7 @@ static const struct op_info pres_op_info[] = > {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ > {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ > {0x107, "rsq", 1, 0, pres_rsq}, /* PRESHADER_OP_RSQ */ > + {0x105, "exp", 1, 0, pres_exp}, /* PRESHADER_OP_EXP */ > }; It might make sense to keep the array sorted by opcode (which requires either adding the enum into the table or, most likely, reordering the enum too). That way you can binary search into it in the future, if necessary. No particular hurry for that though. > +static void test_preshader_op(IDirect3DDevice9 *device, const char *op_mnem, > + unsigned int opcode, unsigned int args_count, unsigned int *expected_result, > + D3DXVECTOR4 *fvect1, D3DXVECTOR4 *fvect2, unsigned int ulps, BOOL *todo) > +{ > + DWORD test_effect_blob[ARRAY_SIZE(test_effect_preshader_effect_blob)]; It's not a huge array but it seems better to avoid putting it on the stack nonetheless - i.e. please allocate it dynamically with HeapAlloc(). > + HRESULT hr; > + ID3DXEffect *effect; > + D3DLIGHT9 light; > + unsigned int i, npasses; passes_count? > + float *v; > + unsigned int op_pos, op_step, result_index; > + D3DXHANDLE param; > + > + if (args_count == 1) > + { > + op_pos = TEST_EFFECT_PRESHADER_OP0_POS; > + op_step = TEST_EFFECT_PRESHADER_OP0_INS_SIZE; > + result_index = 0; > + } > + else if (args_count == 2) > + { > + op_pos = TEST_EFFECT_PRESHADER_OPMUL_POS; > + op_step = TEST_EFFECT_PRESHADER_OPMUL_INS_SIZE; > + result_index = 2; > + } > + else > + { > + return; > + } That doesn't seem particularly nice, especially WRT extending this test later on. It seems better to have the "original" bytecode and these variables you compute here passed in from the caller (maybe stored in a struct together with the opcode parameters). test_effect_preshader_ops() should probably be table-based. At that point the *_POS and *_SIZE defines might become unnecessary; if they stay they should probably be named after the argument count (which is the actually interesting part, the original operation is going to change for the test and can be figured out from the light index) instead. > + memcpy(test_effect_blob, test_effect_preshader_effect_blob, sizeof test_effect_blob); > + for (i = 0; i < 4; i++) ++i, for consistency.

2 2

Re: [PATCH 3/4] d3drm: Implement IDirect3DRM*_CreateTexture.
by Stefan Dösinger 01 May '16

01 May '16

> Am 28.04.2016 um 20:17 schrieb Aaryaman Vasishta <jem456.vasishta(a)gmail.com>: > > @@ -198,13 +198,24 @@ static HRESULT WINAPI d3drm1_CreateTexture(IDirect3DRM *iface, > struct d3drm_texture *object; > HRESULT hr; > > - FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, texture); > + TRACE("iface %p, image %p, texture %p.\n", iface, image, texture); > + > + if (!d3drm_validate_image(image)) > + return D3DRMERR_BADVALUE; > > if (FAILED(hr = d3drm_texture_create(&object))) > + { > + d3drm_texture_destroy(object); > return hr; > + } > + object->d3drm = iface; > + object->initialized = TRUE; > + object->image = image; > > *texture = &object->IDirect3DRMTexture_iface; > > + IDirect3DRM_AddRef(iface); > + > return D3DRM_OK; > } > Is there anything wrong with calling Texture3::InitFromImage here, or even calling IDirect3DRM3::CreateTexture? in D3DRM1::CreateTexture and D3DRM2::CreateTexture?

2 3

Re: comdlg32: check for overflow before dereferencing (resend)
by Sebastian Lackner 01 May '16

01 May '16

On 01.05.2016 17:30, Pierre Schweitzer wrote: > - while ((lpstrEdit[nStrCharCount]!='"') && (nStrCharCount <= nStrLen)) > + while ((nStrCharCount <= nStrLen) && (lpstrEdit[nStrCharCount]!='"')) The change looks correct, but while you are just it, you might also want to fix the operator here. It probably should be <, otherwise the loop will also copy the terminating \0 character. Same for the comparison a couple of lines above.

2 1

Fw: [PATCH 2/2] kernel32/tests: Add tests for SetConsoleFont
by Hugh McMaster 01 May '16

01 May '16

On Sunday, 1 May 2016 10:19 PM, Marvin wrote: > 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 > https://testbot.winehq.org/JobDetails.pl?Key=22777 > > Your paranoid android. > > === w8 (32 bit console) === > console.c:1445: Test failed: [13] Expected output count to be 0, got 4115832529 > console.c:1445: Test failed: [15] Expected output count to be 0, got 4115832529 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 4115832529 > console.c:1689: Test failed: [13] Expected output count to be 0, got 4115832529 > console.c:1689: Test failed: [15] Expected output count to be 0, got 4115832529 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 4115832529 > > === w864 (32 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [13] Expected output count to be 0, got 3160603465 > console.c:1445: Test failed: [15] Expected output count to be 0, got 3160603465 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3160603465 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [13] Expected output count to be 0, got 3160603465 > console.c:1689: Test failed: [15] Expected output count to be 0, got 3160603465 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3160603465 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 > > === w1064 (32 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [13] Expected output count to be 0, got 2978365710 > console.c:1445: Test failed: [15] Expected output count to be 0, got 2978365710 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2978365710 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [13] Expected output count to be 0, got 2978365710 > console.c:1689: Test failed: [15] Expected output count to be 0, got 2978365710 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2978365710 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 > > === w864 (64 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 > > === w1064 (64 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 These are existing failures.

1 0

Fw: [PATCH 1/2] kernel32/tests: Add more tests for GetConsoleFontInfo (v3)
by Hugh McMaster 01 May '16

01 May '16

On Sunday, 1 May 2016 10:09 PM, Marvin wrote: > 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 > https://testbot.winehq.org/JobDetails.pl?Key=22776 > > Your paranoid android. > > === w8 (32 bit console) === > console.c:1445: Test failed: [13] Expected output count to be 0, got 3531622039 > console.c:1445: Test failed: [15] Expected output count to be 0, got 3531622039 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3531622039 > console.c:1689: Test failed: [13] Expected output count to be 0, got 3531622039 > console.c:1689: Test failed: [15] Expected output count to be 0, got 3531622039 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3531622039 > > === w864 (32 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [13] Expected output count to be 0, got 1438038684 > console.c:1445: Test failed: [15] Expected output count to be 0, got 1438038684 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 1438038684 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [13] Expected output count to be 0, got 1438038684 > console.c:1689: Test failed: [15] Expected output count to be 0, got 1438038684 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 1438038684 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 > > === w1064 (32 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [13] Expected output count to be 0, got 1797978764 > console.c:1445: Test failed: [15] Expected output count to be 0, got 1797978764 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 1797978764 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [13] Expected output count to be 0, got 1797978764 > console.c:1689: Test failed: [15] Expected output count to be 0, got 1797978764 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 1797978764 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 > > === w864 (64 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 > > === w1064 (64 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 These are existing failures.

1 0

Re: [PATCH 2/2] kernel32/tests: Add tests for SetConsoleFont
by Marvin 01 May '16

01 May '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22777 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 4115832529 console.c:1445: Test failed: [15] Expected output count to be 0, got 4115832529 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 4115832529 console.c:1689: Test failed: [13] Expected output count to be 0, got 4115832529 console.c:1689: Test failed: [15] Expected output count to be 0, got 4115832529 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 4115832529 === w864 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 3160603465 console.c:1445: Test failed: [15] Expected output count to be 0, got 3160603465 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3160603465 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 3160603465 console.c:1689: Test failed: [15] Expected output count to be 0, got 3160603465 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3160603465 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 2978365710 console.c:1445: Test failed: [15] Expected output count to be 0, got 2978365710 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2978365710 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 2978365710 console.c:1689: Test failed: [15] Expected output count to be 0, got 2978365710 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2978365710 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w864 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

1 0

Re: [PATCH 1/2] kernel32/tests: Add more tests for GetConsoleFontInfo (v3)
by Marvin 01 May '16

01 May '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22776 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 3531622039 console.c:1445: Test failed: [15] Expected output count to be 0, got 3531622039 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3531622039 console.c:1689: Test failed: [13] Expected output count to be 0, got 3531622039 console.c:1689: Test failed: [15] Expected output count to be 0, got 3531622039 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3531622039 === w864 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 1438038684 console.c:1445: Test failed: [15] Expected output count to be 0, got 1438038684 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 1438038684 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 1438038684 console.c:1689: Test failed: [15] Expected output count to be 0, got 1438038684 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 1438038684 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 1797978764 console.c:1445: Test failed: [15] Expected output count to be 0, got 1797978764 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 1797978764 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 1797978764 console.c:1689: Test failed: [15] Expected output count to be 0, got 1797978764 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 1797978764 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w864 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

1 0

Re: wintrust/tests: Fix a typo in ok() messages
by Marvin 01 May '16

01 May '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22774 Your paranoid android. === w1064 (32 bit crypt) === crypt.c:1024: Test failed: Expected 00010000, got ffffffff crypt.c:1024: Test failed: Expected 00010001, got ffffffff === w1064 (64 bit crypt) === crypt.c:1024: Test failed: Expected 00010000, got ffffffff crypt.c:1024: Test failed: Expected 00010001, got ffffffff

1 0

Re: ddraw/tests: Fix a typo in ok() message
by Marvin 01 May '16

01 May '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22771 Your paranoid android. === w864 (32 bit d3d) === d3d.c:2326: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2510: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2657: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level === w1064 (32 bit d3d) === d3d.c:2326: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2510: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2657: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level

1 0

Re: [PATCH] po: update Norwegian translation
by Kim Malmo 30 Apr '16

30 Apr '16

I just realized I wasn't done proofreading. v2 inbound. Den 30. april 2016 16:18, skrev Kim Malmo: > I have added missing translations and fixed up the fuzzy ones. I've also > fixed some minor typos and spelling errors in the old translation. > > The undertaking that might stand out here however, is I've tried to make > it more consistent with itself, and more consistent with the original > english text. One thing I want to point out is the (former) usage of > « and » signs. First of all the are no longer present on Norwegian > keyboards, second and perhaps most importantly, they look hideous with > whatever is the default Wine font. For consistency what I've done is the > following: > > * For %1 (or similar) in the english text I have used %1 or '%1' depending > on context. In some cases it makes sense to wrap handles or operations > in Norwegian. > > * For '%1' (or similar) in the english text I have used '%1' > > * All cases of «%1» (or similar) has been changed to %1 or '%1' depending > on context. > > For parts of the translation I have tried to make the context and meaning > more clear. There are also quite a few changes to make it more conformant > with Microsoft's Norwegian Bokmål Style Guide. > > Signed-off-by: Kim Malmo <berencamlost(a)msn.com> > --- > po/nb_NO.po | 954 ++++++++++++++++++++++++++---------------------------------- > 1 file changed, 419 insertions(+), 535 deletions(-) > > diff --git a/po/nb_NO.po b/po/nb_NO.po > index ec01b3e..83eb815 100644 > --- a/po/nb_NO.po > +++ b/po/nb_NO.po > @@ -5,8 +5,8 @@ msgstr "" > "Project-Id-Version: Wine\n" > "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" > "POT-Creation-Date: N/A\n" > -"PO-Revision-Date: 2013-12-26 02:24+0000\n" > -"Last-Translator: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com>\n" > +"PO-Revision-Date: 2016-04-30 12:00+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" > "MIME-Version: 1.0\n" > @@ -24,7 +24,7 @@ msgid "" > "To install a new program from a floppy disk, CD-ROM drive, or your hard " > "drive, click Install." > msgstr "" > -"Trykk «Installer» for å installere et program fra en diskett, CD-stasjon " > +"Trykk 'Installer' for å installere et program fra en diskett, CD-stasjon " > "eller annet medium." > > #: appwiz.rc:62 > @@ -169,9 +169,8 @@ msgid "" > "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " > "details." > msgstr "" > -"Wine klarte ikke å finne Mono-pakken, som er nødvendig for at .NET-" > -"programmer skal fungere ordentlig. Wine kan laste ned og installere denne " > -"pakken for deg.\n" > +"Wine fant ikke Mono-pakken, som er nødvendig for at .NET programmer skal " > +"fungere ordentlig. Wine kan laste ned og installere denne pakken for deg.\n" > "\n" > "Merk: det anbefales at du bruker Mono-pakken som følger med operativsystemet " > "ditt. Se <a href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/" > @@ -196,7 +195,7 @@ msgid "" > "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " > "entry for this program from the registry?" > msgstr "" > -"Klarte ikke kjøre avinstalleringsprogrammet, «%s». Vil du fjerne oppføringen " > +"Klarte ikke kjøre avinstalleringsprogrammet, '%s'. Vil du fjerne oppføringen " > "fra listen over installerte programmer?" > > #: appwiz.rc:36 > @@ -412,7 +411,7 @@ msgstr "Fil&navn:" > > #: comdlg32.rc:163 comdlg32.rc:185 > msgid "&Directories:" > -msgstr "&Kateloger:" > +msgstr "&Kataloger:" > > #: comdlg32.rc:166 comdlg32.rc:188 > msgid "List Files of &Type:" > @@ -457,7 +456,7 @@ msgstr "M&erket område" > > #: comdlg32.rc:209 > msgid "&Pages" > -msgstr "&Sider" > +msgstr "Si&der" > > #: comdlg32.rc:212 comdlg32.rc:234 > msgid "&Setup" > @@ -497,7 +496,7 @@ msgstr "Stan&dardskriver" > > #: comdlg32.rc:229 > msgid "[none]" > -msgstr "(Ingen)" > +msgstr "[ingen]" > > #: comdlg32.rc:230 > msgid "Specific &Printer" > @@ -521,7 +520,7 @@ msgstr "Papir" > > #: comdlg32.rc:241 > msgid "Si&ze" > -msgstr "Størr&else" > +msgstr "St&ørrelse" > > #: comdlg32.rc:242 > msgid "&Source" > @@ -541,7 +540,7 @@ msgstr "Skriftst&il:" > > #: comdlg32.rc:259 comdlg32.rc:436 winecfg.rc:294 > msgid "&Size:" > -msgstr "Størrelse:" > +msgstr "&Størrelse:" > > #: comdlg32.rc:266 > msgid "Effects" > @@ -557,7 +556,7 @@ msgstr "&Understreket" > > #: comdlg32.rc:269 winecfg.rc:292 > msgid "&Color:" > -msgstr "Farge:" > +msgstr "&Farge:" > > #: comdlg32.rc:272 > msgid "Sample" > @@ -708,7 +707,7 @@ msgstr "S&orter" > > #: comdlg32.rc:385 > msgid "Pa&ges" > -msgstr "&Sider" > +msgstr "Si&der" > > #: comdlg32.rc:386 > msgid "&Selection" > @@ -724,7 +723,7 @@ msgstr "&Til:" > > #: comdlg32.rc:416 winecfg.rc:300 > msgid "Si&ze:" > -msgstr "Størrelse:" > +msgstr "St&ørrelse:" > > #: comdlg32.rc:418 > msgid "&Source:" > @@ -824,14 +823,14 @@ msgstr "" > > #: comdlg32.rc:36 > msgid "Invalid character(s) in path" > -msgstr "Ugyldige tegn i filnavnet" > +msgstr "Ugyldig(e) tegn i filnavnet" > > #: comdlg32.rc:37 > msgid "" > "A filename cannot contain any of the following characters:\n" > " / : < > |" > msgstr "" > -"Et filnavn kan ikke inneholder følgende tegn:\n" > +"Et filnavn kan ikke inneholde følgende tegn:\n" > " / : < > |" > > #: comdlg32.rc:38 > @@ -844,7 +843,7 @@ msgstr "Filen finnes ikke" > > #: comdlg32.rc:40 > msgid "The selection contains a non-folder object" > -msgstr "" > +msgstr "Valget inneholder ett objekt som ikke er en mappe" > > #: comdlg32.rc:45 > msgid "Up One Level" > @@ -884,7 +883,7 @@ msgstr "Fet kursiv" > > #: comdlg32.rc:121 wordpad.rc:117 > msgid "Black" > -msgstr "Svart" > +msgstr "Sort" > > #: comdlg32.rc:122 wordpad.rc:118 > msgid "Maroon" > @@ -936,11 +935,11 @@ msgstr "Blå" > > #: comdlg32.rc:134 wordpad.rc:130 > msgid "Fuchsia" > -msgstr "Fuchsia" > +msgstr "Magenta" > > #: comdlg32.rc:135 wordpad.rc:131 > msgid "Aqua" > -msgstr "Cyanblå" > +msgstr "Havblå" > > #: comdlg32.rc:136 wordpad.rc:132 > msgid "White" > @@ -972,7 +971,7 @@ msgstr "" > > #: comdlg32.rc:64 > msgid "The 'Number of copies' field cannot be empty." > -msgstr "Feltet «Antall kopier» kan ikke være tomt." > +msgstr "Feltet 'Antall kopier' kan ikke være tomt." > > #: comdlg32.rc:66 > msgid "" > @@ -992,7 +991,7 @@ msgstr "Ingen standardskriver er definert." > > #: comdlg32.rc:69 > msgid "Cannot find the printer." > -msgstr "Kunne ikke finne skriveren." > +msgstr "Kan ikke finne skriveren." > > #: comdlg32.rc:70 progman.rc:76 > msgid "Out of memory." > @@ -1035,14 +1034,12 @@ msgid "Open File" > msgstr "Åpne fil" > > #: comdlg32.rc:147 > -#, fuzzy > -#| msgid "New Folder" > msgid "Select Folder" > -msgstr "Ny mappe" > +msgstr "Velg mappe" > > #: comdlg32.rc:148 > msgid "Font size has to be a number." > -msgstr "" > +msgstr "Skriftstørrelse må være ett tall." > > #: comdlg32.rc:83 oleview.rc:98 > msgid "Ready" > @@ -1158,11 +1155,11 @@ msgstr "Det er %d dokumenter i køen" > > #: comdlg32.rc:79 > msgid "Margins [inches]" > -msgstr "Marger (tommer)" > +msgstr "Marger [tommer]" > > #: comdlg32.rc:80 > msgid "Margins [mm]" > -msgstr "Marger (mm)" > +msgstr "Marger [mm]" > > #: comdlg32.rc:81 sane.rc:33 > msgctxt "unit: millimeters" > @@ -1352,35 +1349,35 @@ msgstr "Sertifikatmangfold" > > #: crypt32.rc:63 > msgid "Netscape Cert Type" > -msgstr "Netscape-sertifikattype" > +msgstr "Netscape sertifikattype" > > #: crypt32.rc:64 > msgid "Netscape Base URL" > -msgstr "Netscape-basis-URL" > +msgstr "Netscape basis-URL" > > #: crypt32.rc:65 > msgid "Netscape Revocation URL" > -msgstr "Netscape-tilbakekalling-URL" > +msgstr "Netscape tilbakekallings-URL" > > #: crypt32.rc:66 > msgid "Netscape CA Revocation URL" > -msgstr "Netscape-CA-tilbakekalling-URLURL" > +msgstr "Netscape CA-tilbakekallings-URL" > > #: crypt32.rc:67 > msgid "Netscape Cert Renewal URL" > -msgstr "Netscape-sertifikatfornying-URL" > +msgstr "Netscape sertifikatfornyings-URL" > > #: crypt32.rc:68 > msgid "Netscape CA Policy URL" > -msgstr "Netscape-CA-politikk-URL" > +msgstr "Netscape CA-politikk-URL" > > #: crypt32.rc:69 > msgid "Netscape SSL ServerName" > -msgstr "Netscape-SSL-tjenernavn" > +msgstr "Netscape SSL-tjenernavn" > > #: crypt32.rc:70 > msgid "Netscape Comment" > -msgstr "Netscape-kommentar" > +msgstr "Netscape kommentar" > > #: crypt32.rc:71 > msgid "Country/Region" > @@ -1452,7 +1449,7 @@ msgstr "Hovednavn" > > #: crypt32.rc:88 > msgid "Windows Product Update" > -msgstr "Windows-produktoppdatering" > +msgstr "Windows produktoppdatering" > > #: crypt32.rc:89 > msgid "Enrollment Name Value Pair" > @@ -1500,7 +1497,7 @@ msgstr "Distribusjonspunkter for kryss-sertifikat" > > #: crypt32.rc:100 > msgid "Application Policies" > -msgstr "Framgangsmåter for programmers" > +msgstr "Framgangsmåter for programmer" > > #: crypt32.rc:101 > msgid "Application Policy Mappings" > @@ -1560,7 +1557,7 @@ msgstr "PKCS 7 Kryptert" > > #: crypt32.rc:115 > msgid "Previous CA Certificate Hash" > -msgstr "Forrige CA-sertifikatlappskaus" > +msgstr "Forrige CA-sertifikat-hash" > > #: crypt32.rc:116 > msgid "Virtual Base CRL Number" > @@ -1584,7 +1581,7 @@ msgstr "Informasjon om sertifikatmal" > > #: crypt32.rc:121 > msgid "Enterprise Root OID" > -msgstr "Storselskap-rot-OID" > +msgstr "Selskap-rot-OID" > > #: crypt32.rc:122 > msgid "Dummy Signer" > @@ -1596,7 +1593,7 @@ msgstr "Kryptert privat nøkkel" > > #: crypt32.rc:124 > msgid "Published CRL Locations" > -msgstr "Publisert CRL-plasseringer" > +msgstr "Publiserte CRL-plasseringer" > > #: crypt32.rc:125 > msgid "Enforce Certificate Chain Policy" > @@ -1640,7 +1637,7 @@ msgstr "Liste over tiltrodde sertifikater" > > #: crypt32.rc:135 > msgid "Archived Key Certificate Hash" > -msgstr "Arkivert nøkkelsertifikatlappskaus" > +msgstr "Arkivert nøkkelsertifikat-hash" > > #: crypt32.rc:136 > msgid "Private Key Usage Period" > @@ -1903,7 +1900,7 @@ msgstr "Navn på distribusjonspunkt" > > #: crypt32.rc:208 > msgid "Full Name" > -msgstr "Fult navn" > +msgstr "Fullt navn" > > #: crypt32.rc:209 > msgid "RDN Name" > @@ -2135,7 +2132,7 @@ msgstr "Bruk sertifikat&et til alle mulige formål" > > #: cryptui.rc:246 > msgid "D&isable all purposes for this certificate" > -msgstr "Ikke bruk dette sertifikatet til noen formål" > +msgstr "&Ikke bruk dette sertifikatet til noen formål" > > #: cryptui.rc:248 > msgid "Enable &only the following purposes for this certificate:" > @@ -2188,14 +2185,14 @@ msgid "" > msgstr "" > "Denne veiviseren hjelper deg å importere sertifikater og lister over " > "tilbakekalte eller tiltrodde sertifikater fra en fil til et " > -"serfifikatlager.\n" > +"sertifikatlager.\n" > "\n" > "Et sertifikat kan brukes til å identifisere deg eller datamaskinen du " > "kommuniserer med. Det kan også brukes til signering av meldinger eller andre " > "former for godkjenning. Sertifikatlagre er samlinger av sertifikater og " > "lister over tiltrodde eller tilbakekalte sertifikater.\n" > "\n" > -"Trykk «Neste» for å fortsette." > +"Trykk 'Neste' for å fortsette." > > #: cryptui.rc:294 cryptui.rc:430 > msgid "&File name:" > @@ -2239,7 +2236,7 @@ msgstr "Velg sertifikatlager &automatisk" > > #: cryptui.rc:315 > msgid "&Place all certificates in the following store:" > -msgstr "&Plasser aller sertifikatene i følgende lager:" > +msgstr "&Plasser alle sertifikatene i følgende lager:" > > #: cryptui.rc:325 > msgid "Completing the Certificate Import Wizard" > @@ -2333,7 +2330,7 @@ msgstr "" > "former for godkjenning. Sertifikatlagre er samlinger av sertifikater og " > "lister over tiltrodde eller tilbakekalte sertifikater.\n" > "\n" > -"Trykk «Neste» for å fortsette." > +"Trykk 'Neste' for å fortsette." > > #: cryptui.rc:384 > msgid "" > @@ -2385,7 +2382,7 @@ msgstr "&Personlig informasjonsutveksling/PKCS #12 (*.pfx)" > > #: cryptui.rc:418 > msgid "Incl&ude all certificates in the certification path if possible" > -msgstr "Ta med aller sertifikater i sertifikatstien, hvis m&ulig" > +msgstr "Ta med alle sertifikater i sertifikatstien, hvis m&ulig" > > #: cryptui.rc:420 > msgid "&Enable strong encryption" > @@ -2431,7 +2428,7 @@ msgstr "" > > #: cryptui.rc:34 > msgid "This certificate could not be validated to a trusted root certificate." > -msgstr "Dette sertifikatet kunne ikke godkjennes med et rotsertifikat." > +msgstr "Dette sertifikatet kunne ikke godkjennes til et rotsertifikat." > > #: cryptui.rc:35 > msgid "This certificate's issuer could not be found." > @@ -2539,7 +2536,7 @@ msgstr "%1 (%2!d! bit)" > > #: cryptui.rc:62 > msgid "SHA1 hash" > -msgstr "SHA1-kode" > +msgstr "SHA1-hash" > > #: cryptui.rc:63 > msgid "Enhanced key usage (property)" > @@ -2559,7 +2556,7 @@ msgstr "Sertifikategenskaper" > > #: cryptui.rc:67 > msgid "Please enter an OID in the form 1.2.3.4" > -msgstr "Angi en OID på formen 1.2.3.4" > +msgstr "Angi en OID i format 1.2.3.4" > > #: cryptui.rc:68 > msgid "The OID you entered already exists." > @@ -2643,7 +2640,7 @@ msgstr "Sertifikatlager valgt" > > #: cryptui.rc:90 > msgid "Automatically determined by the program" > -msgstr "Bestemt av proggramet" > +msgstr "Bestemt av programmet" > > #: cryptui.rc:91 shell32.rc:137 > msgid "File" > @@ -2732,11 +2729,6 @@ msgstr "" > "Er du sikker på at du vil fjerne dette sertifikatet?" > > #: cryptui.rc:113 > -#, fuzzy > -#| msgid "" > -#| "You will no longer be able to encrypt messages with these certificates, " > -#| "or verify messages signed with it.\n" > -#| "Are you sure you want to remove these certificates?" > msgid "" > "You will no longer be able to encrypt messages with these certificates, or " > "verify messages signed with them.\n" > @@ -2824,7 +2816,7 @@ msgid "" > "Protects software from alteration after publication" > msgstr "" > "Forsikrer at programvare kommer fra den originale utgiveren\n" > -"Beskytter programvare mot endringer" > +"Beskytter programvare mot endringer etter utgivelse" > > #: cryptui.rc:127 > msgid "Protects e-mail messages" > @@ -3013,7 +3005,7 @@ msgstr "Kyrillisk" > > #: gdi32.rc:31 > msgid "Greek" > -msgstr "gresk" > +msgstr "Gresk" > > #: gdi32.rc:32 > msgid "Turkish" > @@ -3041,7 +3033,7 @@ msgstr "Thailandsk" > > #: gdi32.rc:38 > msgid "Japanese" > -msgstr "japansk" > +msgstr "Japansk" > > #: gdi32.rc:39 > msgid "CHINESE_GB2312" > @@ -3150,10 +3142,8 @@ msgid "&View Source" > msgstr "&Vis kildekode" > > #: hhctrl.rc:83 > -#, fuzzy > -#| msgid "Properties" > msgid "Proper&ties" > -msgstr "Egenskaper" > +msgstr "E%genskaper" > > #: hhctrl.rc:87 shdoclc.rc:79 shdoclc.rc:93 shdoclc.rc:117 shdoclc.rc:159 > #: shdoclc.rc:183 user32.rc:60 wordpad.rc:104 > @@ -3324,19 +3314,19 @@ msgstr "Adresse" > > #: ieframe.rc:81 > msgid "Searching for %s" > -msgstr "Søker etter «%s»" > +msgstr "Søker etter %s" > > #: ieframe.rc:82 > msgid "Start downloading %s" > -msgstr "Starter nedlasting av «%s»" > +msgstr "Start nedlasting av %s" > > #: ieframe.rc:83 > msgid "Downloading %s" > -msgstr "Laster ned «%s»" > +msgstr "Laster ned %s" > > #: ieframe.rc:84 > msgid "Asking for %s" > -msgstr "Spør etter «%s»" > +msgstr "Spør etter %s" > > #: inetcpl.rc:49 > msgid "Home page" > @@ -3403,7 +3393,7 @@ msgid "" > "List of websites you have accessed." > msgstr "" > "Historikk\n" > -"Liste av nettsidene du har besøkt." > +"Liste over nettsidene du har besøkt." > > #: inetcpl.rc:77 > msgid "" > @@ -3586,16 +3576,12 @@ msgid "Expected ')'" > msgstr "Forventet ')'" > > #: jscript.rc:40 > -#, fuzzy > -#| msgid "Subject Key Identifier" > msgid "Expected identifier" > -msgstr "Identifiserer for emnenøkkel" > +msgstr "Forventet identifiserer" > > #: jscript.rc:41 > -#, fuzzy > -#| msgid "Expected ';'" > msgid "Expected '='" > -msgstr "Forventet ';'" > +msgstr "Forventet '='" > > #: jscript.rc:42 > msgid "Invalid character" > @@ -3607,39 +3593,35 @@ msgstr "Uavsluttet strengkonstant" > > #: jscript.rc:44 > msgid "'return' statement outside of function" > -msgstr "«return» utenfor en funksjon" > +msgstr "'return' utenfor en funksjon" > > #: jscript.rc:45 > msgid "Can't have 'break' outside of loop" > -msgstr "«break» kan kun forekomme i en løkke" > +msgstr "'break' kan kun forekomme i en løkke" > > #: jscript.rc:46 > msgid "Can't have 'continue' outside of loop" > -msgstr "«continue» kan kun forekomme i en løkke" > +msgstr "'continue' kan kun forekomme i en løkke" > > #: jscript.rc:47 > msgid "Label redefined" > -msgstr "Merkelappen ble omdefinert" > +msgstr "Etiketten ble omdefinert" > > #: jscript.rc:48 > msgid "Label not found" > msgstr "Fant ikke etiketten" > > #: jscript.rc:49 > -#, fuzzy > -#| msgid "Expected ';'" > msgid "Expected '@end'" > -msgstr "Forventet ';'" > +msgstr "Forventet '@end'" > > #: jscript.rc:50 > msgid "Conditional compilation is turned off" > msgstr "Avhengig kompilering er skrudd av" > > #: jscript.rc:51 > -#, fuzzy > -#| msgid "Expected ';'" > msgid "Expected '@'" > -msgstr "Forventet ';'" > +msgstr "Forventet '@'" > > #: jscript.rc:54 > msgid "Number expected" > @@ -3671,7 +3653,7 @@ msgstr "Forventet boolsk verdi" > > #: jscript.rc:59 > msgid "Cannot delete '|'" > -msgstr "Klarte ikke slette «|»" > +msgstr "Kan ikke slette '|'" > > #: jscript.rc:60 > msgid "VBArray object expected" > @@ -3687,11 +3669,11 @@ msgstr "Syntaksfeil i regulært uttrykk" > > #: jscript.rc:64 > msgid "URI to be encoded contains invalid characters" > -msgstr "URI'en som skulle kodes inneholder ugyldige tegn" > +msgstr "URI'en som skal kodes inneholder ugyldige tegn" > > #: jscript.rc:63 > msgid "URI to be decoded is incorrect" > -msgstr "Adressen som skal dekodes er ugyldig" > +msgstr "URI'en som skal dekodes er feil" > > #: jscript.rc:65 > msgid "Number of fraction digits is out of range" > @@ -3959,7 +3941,7 @@ msgstr "Filen finnes fra før.\n" > > #: winerror.mc:336 > msgid "Cannot create.\n" > -msgstr "Klarte ikke opprette.\n" > +msgstr "Kan ikke opprette.\n" > > #: winerror.mc:341 > msgid "Int24 failure.\n" > @@ -4179,7 +4161,7 @@ msgstr "Systemsporing er ikke oppgitt eller nektes.\n" > > #: winerror.mc:621 > msgid "Event count for DosMuxSemWait incorrect.\n" > -msgstr "Ugyldig antall hendelser forDosMuxSemWait.\n" > +msgstr "Ugyldig antall hendelser for DosMuxSemWait.\n" > > #: winerror.mc:626 > msgid "Too many waiters for DosMuxSemWait.\n" > @@ -4203,7 +4185,7 @@ msgstr "Signalet ble nektet.\n" > > #: winerror.mc:651 > msgid "Segment discarded.\n" > -msgstr "Segmentet ble avslått.\n" > +msgstr "Segmentet ble forkastet.\n" > > #: winerror.mc:656 > msgid "Segment not locked.\n" > @@ -4363,7 +4345,7 @@ msgstr "For mange moduler.\n" > > #: winerror.mc:851 > msgid "Nesting LoadModule calls not allowed.\n" > -msgstr "Sammenhengende LoadModule-kall støttes ikke.\n" > +msgstr "Sammenhengende LoadModule-kall ikke tillatt.\n" > > #: winerror.mc:856 > msgid "Machine type mismatch.\n" > @@ -4455,7 +4437,7 @@ msgstr "Mottok ugyldig oplock-melding.\n" > > #: winerror.mc:966 > msgid "Message 0x%1 not found in file %2.\n" > -msgstr "Fant ikke meldingen 0x%1 i filen «%2».\n" > +msgstr "Fant ikke meldingen 0x%1 i filen '%2'.\n" > > #: winerror.mc:971 > msgid "Invalid address.\n" > @@ -4507,7 +4489,7 @@ msgstr "Ugyldig melding.\n" > > #: winerror.mc:1031 > msgid "Cannot complete.\n" > -msgstr "Klarte ikke fullføre.\n" > +msgstr "Kan ikke fullføre.\n" > > #: winerror.mc:1036 > msgid "Invalid flags.\n" > @@ -4539,15 +4521,15 @@ msgstr "Ugyldig nøkkel.\n" > > #: winerror.mc:1071 > msgid "Can't open registry key.\n" > -msgstr "Klarte ikke åpne registernøkkel.\n" > +msgstr "Kan ikke åpne registernøkkel.\n" > > #: winerror.mc:1076 > msgid "Can't read registry key.\n" > -msgstr "Klarte ikke lese registernøkkel.\n" > +msgstr "Kan ikke lese registernøkkel.\n" > > #: winerror.mc:1081 > msgid "Can't write registry key.\n" > -msgstr "Klarte ikke å skrive til registernøkkel.\n" > +msgstr "Kan ikke å skrive til registernøkkel.\n" > > #: winerror.mc:1086 > msgid "Registry has been recovered.\n" > @@ -4599,7 +4581,7 @@ msgstr "Tidsavbrudd for tjenesteforespørsel.\n" > > #: winerror.mc:1146 > msgid "Cannot create service thread.\n" > -msgstr "Klarte ikke opprette tjenestetråd.\n" > +msgstr "Kan ikke opprette tjenestetråd.\n" > > #: winerror.mc:1151 > msgid "Service database locked.\n" > @@ -4823,7 +4805,7 @@ msgstr "Diskett-registre er inkonsistente.\n" > > #: winerror.mc:1426 > msgid "Hard disk recalibrate failed.\n" > -msgstr "Klarte ikke justere harddisken på nytt.\n" > +msgstr "Klarte ikke kalibrere harddisken på nytt.\n" > > #: winerror.mc:1431 > msgid "Hard disk operation failed.\n" > @@ -4891,7 +4873,7 @@ msgstr "DDE-feil.\n" > > #: winerror.mc:1511 > msgid "DLL not found.\n" > -msgstr "Klarte ikke finne DLL.\n" > +msgstr "Kan ikke finne DLL.\n" > > #: winerror.mc:1516 > msgid "Out of user handles.\n" > @@ -4915,7 +4897,7 @@ msgstr "Elementets adresse er ugyldig.\n" > > #: winerror.mc:1541 > msgid "The magazine is not present.\n" > -msgstr "Magasinet er ikke til stede.\n" > +msgstr "Magasinet er ikke tilstede.\n" > > #: winerror.mc:1546 > msgid "The device needs reinitialization.\n" > @@ -4935,7 +4917,7 @@ msgstr "Enheten er ikke koblet til.\n" > > #: winerror.mc:1566 > msgid "Element not found.\n" > -msgstr "Klarte ikke finne elementet.\n" > +msgstr "Kan ikke finne elementet.\n" > > #: winerror.mc:1571 > msgid "No match found.\n" > @@ -5007,7 +4989,7 @@ msgstr "Ugyldig navn på nettverkstilbyder.\n" > > #: winerror.mc:1656 > msgid "Cannot open network connection profile.\n" > -msgstr "Klarte ikke åpne profil for nettverkstilkobling.\n" > +msgstr "Kan ikke åpne profil for nettverkstilkobling.\n" > > #: winerror.mc:1661 > msgid "Corrupt network connection profile.\n" > @@ -5471,7 +5453,7 @@ msgstr "Ugyldig påloggingstype.\n" > > #: winerror.mc:2241 > msgid "Cannot impersonate.\n" > -msgstr "Klarte ikke personifisere.\n" > +msgstr "Kan ikke personifisere.\n" > > #: winerror.mc:2246 > msgid "Invalid transaction state.\n" > @@ -5619,7 +5601,7 @@ msgstr "Kan ikke lage undervindu på toppnivå.\n" > > #: winerror.mc:2431 > msgid "Can't find window class.\n" > -msgstr "Klarte ikkef inne vindusklassen.\n" > +msgstr "Kan ikke finne vindusklassen.\n" > > #: winerror.mc:2436 > msgid "Window owned by another thread.\n" > @@ -5715,7 +5697,7 @@ msgstr "Journalkroken er allerede aktiv.\n" > > #: winerror.mc:2551 > msgid "Hook procedure not installed.\n" > -msgstr "Krokprosedyren er allerede installert.\n" > +msgstr "Krokprosedyren er ikke installert.\n" > > #: winerror.mc:2556 > msgid "Invalid list box message.\n" > @@ -5843,7 +5825,7 @@ msgstr "Hendelsesloggen er skadet.\n" > > #: winerror.mc:2711 > msgid "Event log can't start.\n" > -msgstr "Klarte ikke starte hendelsesloggen.\n" > +msgstr "Kan ikke starte hendelsesloggen.\n" > > #: winerror.mc:2716 > msgid "Event log file full.\n" > @@ -6099,7 +6081,7 @@ msgstr "Ingen protokollsekvens.\n" > > #: winerror.mc:3031 > msgid "Can't create endpoint.\n" > -msgstr "Klarte ikke opprette endepunkt.\n" > +msgstr "Kan ikke opprette endepunkt.\n" > > #: winerror.mc:3036 > msgid "Out of resources.\n" > @@ -6179,7 +6161,7 @@ msgstr "Strengen er for lang.\n" > > #: winerror.mc:3136 > msgid "Protocol sequence not found.\n" > -msgstr "Klarte ikke finne protokollsekvensen.\n" > +msgstr "Fant ikke protokollsekvensen.\n" > > #: winerror.mc:3141 > msgid "Procedure number out of range.\n" > @@ -6211,7 +6193,7 @@ msgstr "Ugyldig oppføring.\n" > > #: winerror.mc:3176 > msgid "Can't perform operation.\n" > -msgstr "Klarte ikke utføre operasjonen.\n" > +msgstr "Kan ikke utføre operasjonen.\n" > > #: winerror.mc:3181 > msgid "Endpoints not registered.\n" > @@ -6239,7 +6221,7 @@ msgstr "Ikke alle objektene er aveksportert.\n" > > #: winerror.mc:3211 > msgid "Interface not found.\n" > -msgstr "Klarte ikke finne grensesnittet.\n" > +msgstr "Fant ikke grensesnittet.\n" > > #: winerror.mc:3216 > msgid "Entry already exists.\n" > @@ -6247,7 +6229,7 @@ msgstr "Oppføringen finnes fra før.\n" > > #: winerror.mc:3221 > msgid "Entry not found.\n" > -msgstr "Klarte ikke finne oppføringen.\n" > +msgstr "Fant ikke oppføringen.\n" > > #: winerror.mc:3226 > msgid "Name service unavailable.\n" > @@ -6315,7 +6297,7 @@ msgstr "Bindingsreferansen stemmer ikke.\n" > > #: winerror.mc:3306 > msgid "Cannot get call handle.\n" > -msgstr "Klarte ikke hente kallreferansen.\n" > +msgstr "Kan ikke hente kallreferansen.\n" > > #: winerror.mc:3311 > msgid "Null reference pointer.\n" > @@ -6427,15 +6409,15 @@ msgstr "Ingen flere bindinger.\n" > > #: winerror.mc:3446 > msgid "Can't log on with inter-domain trust account.\n" > -msgstr "Klarte ikke logge på med pålitelighetskonto for flere domerer.\n" > +msgstr "Kan ikke logge på med pålitelighetskonto for flere domerer.\n" > > #: winerror.mc:3451 > msgid "Can't log on with workstation trust account.\n" > -msgstr "Klarte ikke logge på med pålitelighetskonto for arbeidsstasjonen.\n" > +msgstr "Kan ikke logge på med pålitelighetskonto for arbeidsstasjonen.\n" > > #: winerror.mc:3456 > msgid "Can't log on with server trust account.\n" > -msgstr "Klarte ikke logge på med pålitelighetskonto for tjeneren.\n" > +msgstr "Kan ikke logge på med pålitelighetskonto for tjeneren.\n" > > #: winerror.mc:3461 > msgid "Domain trust information inconsistent.\n" > @@ -6447,19 +6429,19 @@ msgstr "Tjeneren har åpne referanser.\n" > > #: winerror.mc:3471 > msgid "Resource data not found.\n" > -msgstr "Klarte ikke finne ressursdata.\n" > +msgstr "Fant ikke ressursdata.\n" > > #: winerror.mc:3476 > msgid "Resource type not found.\n" > -msgstr "Klarte ikke finne ressurstypen.\n" > +msgstr "Fant ikke ressurstypen.\n" > > #: winerror.mc:3481 > msgid "Resource name not found.\n" > -msgstr "Klarte ikke finne ressursnavnet.\n" > +msgstr "Fant ikke ressursnavnet.\n" > > #: winerror.mc:3486 > msgid "Resource language not found.\n" > -msgstr "Klarte ikke finne ressursspråket.\n" > +msgstr "Fant ikke ressursspråket.\n" > > #: winerror.mc:3491 > msgid "Not enough quota.\n" > @@ -6531,11 +6513,11 @@ msgstr "Feil versjon på rør.\n" > > #: winerror.mc:3576 > msgid "Group member not found.\n" > -msgstr "Klarte ikke finne gruppemedlemmet.\n" > +msgstr "Fant ikke gruppemedlemmet.\n" > > #: winerror.mc:3581 > msgid "Can't create endpoint mapper DB.\n" > -msgstr "Klarte ikke lage database for endepunkt.\n" > +msgstr "Kan ikke lage database for endepunkt.\n" > > #: winerror.mc:3586 > msgid "Invalid object.\n" > @@ -6571,7 +6553,7 @@ msgstr "Brukeren må endre passord.\n" > > #: winerror.mc:3626 > msgid "Domain controller not found.\n" > -msgstr "Klarte ikke finne domenekontrolleren.\n" > +msgstr "Fant ikke domenekontrolleren.\n" > > #: winerror.mc:3631 > msgid "Account locked out.\n" > @@ -6619,11 +6601,11 @@ msgstr "Intet stedsnavn tilgjengelig.\n" > > #: winerror.mc:3686 > msgid "The file cannot be accessed.\n" > -msgstr "Klarte ikke åpne filen.\n" > +msgstr "Kan ikke åpne filen.\n" > > #: winerror.mc:3691 > msgid "The filename cannot be resolved.\n" > -msgstr "Klarte ikke slå opp filnavnet.\n" > +msgstr "Kan ikke slå opp filnavnet.\n" > > #: winerror.mc:3696 > msgid "RPC entry type mismatch.\n" > @@ -6662,16 +6644,12 @@ msgid "The username could not be found.\n" > msgstr "Brukernavnet finnes ikke.\n" > > #: winerror.mc:3741 > -#, fuzzy > -#| msgid "The site does not exist.\n" > msgid "This network connection does not exist.\n" > -msgstr "Siden finnes ikke.\n" > +msgstr "Denne nettverksforbindelsen finnes ikke.\n" > > #: winerror.mc:3746 > -#, fuzzy > -#| msgid "Connection refused.\n" > msgid "Connection reset by peer.\n" > -msgstr "Tilkobling nektet.\n" > +msgstr "Tilkobling nullstilt av likemann.\n" > > #: localspl.rc:31 localui.rc:31 winspool.rc:30 > msgid "Local Port" > @@ -6703,7 +6681,7 @@ msgstr "Prøv å sende på nyt&t:" > > #: localui.rc:32 > msgid "'%s' is not a valid port name" > -msgstr "«%s» er ikke et gyldig portnavn" > +msgstr "'%s' er ikke et gyldig portnavn" > > #: localui.rc:33 > msgid "Port %s already exists" > @@ -6787,7 +6765,7 @@ msgstr "HTML-dokument" > > #: mshtml.rc:29 > msgid "Downloading from %s..." > -msgstr "Laster ned fra «%s» ..." > +msgstr "Laster ned fra %s..." > > #: mshtml.rc:28 > msgid "Done" > @@ -7204,206 +7182,164 @@ msgid "outline button" > msgstr "utheving for knapp" > > #: oleacc.rc:97 > -#, fuzzy > -#| msgid "Normal" > msgctxt "object state" > msgid "normal" > -msgstr "Normal" > +msgstr "normal" > > #: oleacc.rc:98 > -#, fuzzy > -#| msgid "Unavailable" > msgctxt "object state" > msgid "unavailable" > -msgstr "Utilgjengelig" > +msgstr "utilgjengelig" > > #: oleacc.rc:99 > -#, fuzzy > -#| msgid "Select" > msgctxt "object state" > msgid "selected" > -msgstr "Velg" > +msgstr "valgt" > > #: oleacc.rc:100 > -#, fuzzy > -#| msgid "Paused" > msgctxt "object state" > msgid "focused" > -msgstr "Satt på pause" > +msgstr "fokusert" > > #: oleacc.rc:101 > -#, fuzzy > -#| msgid "&Compressed" > msgctxt "object state" > msgid "pressed" > -msgstr "Kompr&imert" > +msgstr "presset" > > #: oleacc.rc:102 > msgctxt "object state" > msgid "checked" > -msgstr "" > +msgstr "sjekket" > > #: oleacc.rc:103 > -#, fuzzy > -#| msgid "Mixed" > msgctxt "object state" > msgid "mixed" > -msgstr "Blandet" > +msgstr "blandet" > > #: oleacc.rc:104 > -#, fuzzy > -#| msgid "&Read Only" > msgctxt "object state" > msgid "read only" > -msgstr "Sk&rivebeskyttet" > +msgstr "skrivebeskyttet" > > #: oleacc.rc:105 > -#, fuzzy > -#| msgid "Hot Tracked Item" > msgctxt "object state" > msgid "hot tracked" > -msgstr "Merket element" > +msgstr "merket" > > #: oleacc.rc:106 > -#, fuzzy > -#| msgid "Defaults" > msgctxt "object state" > msgid "default" > -msgstr "Standardverdier" > +msgstr "standardverdi" > > #: oleacc.rc:107 > msgctxt "object state" > msgid "expanded" > -msgstr "" > +msgstr "utvidet" > > #: oleacc.rc:108 > msgctxt "object state" > msgid "collapsed" > -msgstr "" > +msgstr "kollapset" > > #: oleacc.rc:109 > msgctxt "object state" > msgid "busy" > -msgstr "" > +msgstr "opptatt" > > #: oleacc.rc:110 > msgctxt "object state" > msgid "floating" > -msgstr "" > +msgstr "flytende" > > #: oleacc.rc:111 > msgctxt "object state" > msgid "marqueed" > -msgstr "" > +msgstr "uthevet" > > #: oleacc.rc:112 > -#, fuzzy > -#| msgid "animation" > msgctxt "object state" > msgid "animated" > -msgstr "animasjon" > +msgstr "animert" > > #: oleacc.rc:113 > msgctxt "object state" > msgid "invisible" > -msgstr "" > +msgstr "usynlig" > > #: oleacc.rc:114 > msgctxt "object state" > msgid "offscreen" > -msgstr "" > +msgstr "utenfor skjermen" > > #: oleacc.rc:115 > -#, fuzzy > -#| msgid "&enable" > msgctxt "object state" > msgid "sizeable" > -msgstr "aktiv&er" > +msgstr "skalerbar" > > #: oleacc.rc:116 > -#, fuzzy > -#| msgid "&enable" > msgctxt "object state" > msgid "moveable" > -msgstr "aktiv&er" > +msgstr "flyttbar" > > #: oleacc.rc:117 > msgctxt "object state" > msgid "self voicing" > -msgstr "" > +msgstr "selv-snakkende" > > #: oleacc.rc:118 > -#, fuzzy > -#| msgid "Paused" > msgctxt "object state" > msgid "focusable" > -msgstr "Satt på pause" > +msgstr "fokuserbar" > > #: oleacc.rc:119 > -#, fuzzy > -#| msgid "table" > msgctxt "object state" > msgid "selectable" > -msgstr "tabell" > +msgstr "valgbar" > > #: oleacc.rc:120 > -#, fuzzy > -#| msgid "link" > msgctxt "object state" > msgid "linked" > -msgstr "kobling" > +msgstr "koblet" > > #: oleacc.rc:121 > msgctxt "object state" > msgid "traversed" > -msgstr "" > +msgstr "traversert" > > #: oleacc.rc:122 > -#, fuzzy > -#| msgid "table" > msgctxt "object state" > msgid "multi selectable" > -msgstr "tabell" > +msgstr "flervalgbar" > > #: oleacc.rc:123 > -#, fuzzy > -#| msgid "Please select a file." > msgctxt "object state" > msgid "extended selectable" > -msgstr "Velg en fil." > +msgstr "utvidet valgbar" > > #: oleacc.rc:124 > -#, fuzzy > -#| msgid "alert" > msgctxt "object state" > msgid "alert low" > -msgstr "varsel" > +msgstr "varsel lav" > > #: oleacc.rc:125 > -#, fuzzy > -#| msgid "alert" > msgctxt "object state" > msgid "alert medium" > -msgstr "varsel" > +msgstr "varsel medium" > > #: oleacc.rc:126 > -#, fuzzy > -#| msgid "alert" > msgctxt "object state" > msgid "alert high" > -msgstr "varsel" > +msgstr "varsel høy" > > #: oleacc.rc:127 > -#, fuzzy > -#| msgid "Write protected.\n" > msgctxt "object state" > msgid "protected" > -msgstr "Skrivebeskyttet.\n" > +msgstr "beskyttet" > > #: oleacc.rc:128 > msgctxt "object state" > msgid "has popup" > -msgstr "" > +msgstr "har sprettoppvindu" > > #: oleaut32.rc:30 oleview.rc:147 > msgid "True" > @@ -7519,22 +7455,16 @@ msgid "Add Control" > msgstr "Legg til kontroller" > > #: oledlg.rc:35 > -#, fuzzy > -#| msgid "&Font..." > msgid "&Convert..." > -msgstr "Skri&ft..." > +msgstr "&Konverter..." > > #: oledlg.rc:36 > -#, fuzzy > -#| msgid "&Object" > msgid "%1 %2 &Object" > -msgstr "&Objekt" > +msgstr "%1 %2 &Objekt" > > #: oledlg.rc:34 > -#, fuzzy > -#| msgid "&Object" > msgid "%1 &Object" > -msgstr "&Objekt" > +msgstr "%1 &Objekt" > > #: oledlg.rc:33 oleview.rc:40 > msgid "&Object" > @@ -7639,7 +7569,7 @@ msgstr "µs" > > #: serialui.rc:28 > msgid "Settings for %s" > -msgstr "Egenskaper for «%s»" > +msgstr "Egenskaper for %s" > > #: serialui.rc:31 > msgid "Baud Rate" > @@ -7687,7 +7617,7 @@ msgstr "Kopier produsentens filer fra:" > > #: setupapi.rc:31 > msgid "The file '%1' on %2 is needed" > -msgstr "Programmet trenger filen «%1» på «%2»" > +msgstr "Programmet trenger filen '%1' på '%2'" > > #: setupapi.rc:32 ipconfig.rc:34 > msgid "Unknown" > @@ -7783,7 +7713,7 @@ msgstr "Bruk som skrivebor&dsobjekt..." > > #: shdoclc.rc:81 shdoclc.rc:134 shdoclc.rc:161 shdoclc.rc:185 > msgid "Copy Shor&tcut" > -msgstr "Kopier snar&veiCopy Shor&tcut" > +msgstr "Kopier snar&vei" > > #: shdoclc.rc:86 shdoclc.rc:139 shdoclc.rc:168 shdoclc.rc:194 > msgid "P&roperties" > @@ -7867,23 +7797,23 @@ msgstr "Feilsøkingsvisning" > > #: shdoclc.rc:204 > msgid "Dump Tree" > -msgstr "Dump «Tree»" > +msgstr "Dump 'Tree'" > > #: shdoclc.rc:205 > msgid "Dump Lines" > -msgstr "Dump «Lines»" > +msgstr "Dump 'Lines'" > > #: shdoclc.rc:206 > msgid "Dump DisplayTree" > -msgstr "Dump «DisplayTree»" > +msgstr "Dump 'DisplayTree'" > > #: shdoclc.rc:207 > msgid "Dump FormatCaches" > -msgstr "Dump «FormatCaches»" > +msgstr "Dump 'FormatCaches'" > > #: shdoclc.rc:208 > msgid "Dump LayoutRects" > -msgstr "Dump «LayoutRects»" > +msgstr "Dump 'LayoutRects'" > > #: shdoclc.rc:209 > msgid "Memory Monitor" > @@ -8080,7 +8010,7 @@ msgstr "Ny &mappe" > > #: shell32.rc:306 > msgid "Message" > -msgstr "Meldings" > +msgstr "Melding" > > #: shell32.rc:309 shlwapi.rc:46 user32.rc:79 > msgid "&Yes" > @@ -8100,7 +8030,7 @@ msgstr "Om %s" > > #: shell32.rc:323 > msgid "Wine &license" > -msgstr "Lisens" > +msgstr "Wine &lisens" > > #: shell32.rc:328 > msgid "Running on %s" > @@ -8214,7 +8144,7 @@ msgstr "Favoritter" > > #: shell32.rc:206 > msgid "StartUp" > -msgstr "Start" > +msgstr "Oppstart" > > #: shell32.rc:207 > msgid "Start Menu" > @@ -8363,7 +8293,7 @@ msgstr "Bekreft sletting av mappe" > > #: shell32.rc:173 > msgid "Are you sure you want to delete '%1'?" > -msgstr "Vil du virkelig slette «%1»?" > +msgstr "Vil du virkelig slette '%1'?" > > #: shell32.rc:174 > msgid "Are you sure you want to delete these %1 items?" > @@ -8379,7 +8309,7 @@ msgid "" > "\n" > "Do you want to replace it?" > msgstr "" > -"Denne mappen inneholder allerede en fil med navn «%1».\n" > +"Denne mappen inneholder allerede en fil med navn '%1'.\n" > "\n" > "Vil du erstatte den?" > > @@ -8390,11 +8320,11 @@ msgstr "Vil du virkelig slette valgte element(er)??" > #: shell32.rc:177 > msgid "" > "Are you sure that you want to send '%1' and all its content to the Trash?" > -msgstr "Vil du virkelig legge «%1» og alt innholdet i papirkurven?" > +msgstr "Vil du virkelig legge '%1' og alt innholdet i papirkurven?" > > #: shell32.rc:176 > msgid "Are you sure that you want to send '%1' to the Trash?" > -msgstr "Vil du virkelig legge «%1» i papirkurven?" > +msgstr "Vil du virkelig legge '%1' i papirkurven?" > > #: shell32.rc:178 > msgid "Are you sure that you want to send these %1 items to the Trash?" > @@ -8403,7 +8333,7 @@ msgstr "Vil du virkelig legge disse %1 valgte elementene i papirkurven?" > #: shell32.rc:179 > msgid "The item '%1' can't be sent to Trash. Do you want to delete it instead?" > msgstr "" > -"Elementet «%1» kan ikke legges i papirkurven. Vil du slette det i stedet?" > +"Elementet '%1' kan ikke legges i papirkurven. Vil du slette det i stedet?" > > #: shell32.rc:186 > msgid "" > @@ -8413,7 +8343,7 @@ msgid "" > "selected folder they will be replaced. Do you still want to move or copy\n" > "the folder?" > msgstr "" > -"Denne mappen inneholder allerede en mappe med navn «%1».\n" > +"Denne mappen inneholder allerede en mappe med navn '%1'.\n" > "\n" > "Hvis filene i mappen du kopierer til heter det samme som filene i mappen du\n" > "kopierer fra, vil disse bli erstattet. Ønsker du fortsatt å flytte eller " > @@ -8446,7 +8376,7 @@ msgstr "Intet Windows-program er satt opp til å åpne denne filtypen." > > #: shell32.rc:246 > msgid "Are you sure you wish to permanently delete '%1'?" > -msgstr "Vil du virkelig slette «%1» permanent?" > +msgstr "Vil du virkelig slette '%1' permanent?" > > #: shell32.rc:247 > msgid "Are you sure you wish to permanently delete these %1 items?" > @@ -8462,7 +8392,7 @@ msgid "" > "\n" > "Do you want to replace it?" > msgstr "" > -"Filen «%1» finnes fra før.\n" > +"Filen i %1 finnes fra før.\n" > "\n" > "Vil du overskrive den?" > > @@ -8472,7 +8402,7 @@ msgid "" > "\n" > "Do you want to replace it?" > msgstr "" > -"Mappen «%1» finnes fra før.\n" > +"Mappen i %1 finnes fra før.\n" > "\n" > "Vil du erstatte den?" > > @@ -8497,16 +8427,16 @@ msgid "" > "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." > msgstr "" > "Wine er fri programvare; du kan distribuere det og/eller endre det i henhold " > -"til vilkårene i «GNU Lesser General Public License», utgitt av the Free " > -"Software Foundation; enten versjon 2.1 av Lisensen, eller (hvis du ønsker " > -"det) en nyere versjon.\n" > +"til vilkårene i 'GNU Lesser General Public License', utgitt av Free Software " > +"Foundation; enten versjon 2.1 av Lisensen, eller (hvis du ønsker det) en " > +"nyere versjon.\n" > "\n" > "Wine utgis i håp om at det er nyttig, men UTEN ENHVER GARANTI; uten engang " > "den antydede garantien om HANDELSEGNETHET eller EGNETHET FOR ET SPESIELT " > -"FORMÅL. Se «GNU Lesser General Public License» for flere detaljer.\n" > +"FORMÅL. Se 'GNU Lesser General Public License' for flere detaljer.\n" > "\n" > -"Du skal ha mottatt et eksemplar av «GNU Lesser General Public License» " > -"sammen med dette programmet; hvis ikke, skriv til: the Free Software " > +"Du skal ha mottatt et eksemplar av 'GNU Lesser General Public License' " > +"sammen med dette programmet; hvis ikke, skriv til: Free Software " > "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." > > #: shell32.rc:256 > @@ -8566,7 +8496,7 @@ msgid "" > "not click install unless you have absolute trust in the above source." > msgstr "" > "Når en ActiveX-komponent er installert har den full tilgang til " > -"datamaskinen. Ikke klikk «Installer» med mindre du stoler på kilden over " > +"datamaskinen. Ikke klikk 'Installer' med mindre du stoler på kilden over " > "fullstendig." > > #: urlmon.rc:51 > @@ -8616,7 +8546,7 @@ msgstr "&Lukk\tCtrl+F4" > > #: user32.rc:51 > msgid "Nex&t\tCtrl+F6" > -msgstr "Nes&e\tCtrl + F6" > +msgstr "Nes&e\tCtrl+F6" > > #: user32.rc:81 > msgid "&Abort" > @@ -8651,58 +8581,44 @@ msgid "Wine" > msgstr "Wine" > > #: winemac.rc:33 > -#, fuzzy > -#| msgid "Hide" > msgid "Hide %@" > -msgstr "Skjul" > +msgstr "Skjul %@" > > #: winemac.rc:35 > -#, fuzzy > -#| msgid "Other" > msgid "Hide Others" > -msgstr "Annen" > +msgstr "Skjul andre" > > #: winemac.rc:36 > -#, fuzzy > -#| msgid "Show" > msgid "Show All" > -msgstr "Vis" > +msgstr "Vis alle" > > #: winemac.rc:37 > msgid "Quit %@" > -msgstr "" > +msgstr "Avslutt %@" > > #: winemac.rc:38 > msgid "Quit" > -msgstr "" > +msgstr "Avslutt" > > #: winemac.rc:40 > -#, fuzzy > -#| msgid "&Window" > msgid "Window" > -msgstr "Vind&u" > +msgstr "Vindu" > > #: winemac.rc:41 > -#, fuzzy > -#| msgid "&Minimize" > msgid "Minimize" > -msgstr "&Minimer" > +msgstr "Minimer" > > #: winemac.rc:42 > -#, fuzzy > -#| msgid "Zoom in" > msgid "Zoom" > msgstr "Forstørr" > > #: winemac.rc:43 > msgid "Enter Full Screen" > -msgstr "" > +msgstr "Gå til fullskjerm" > > #: winemac.rc:44 > -#, fuzzy > -#| msgid "&Bring To Front" > msgid "Bring All to Front" > -msgstr "&Vis øverst" > +msgstr "Vis alle øverst" > > #: wineps.rc:31 > msgid "Paper Si&ze:" > @@ -8713,10 +8629,8 @@ msgid "Duplex:" > msgstr "Retning:" > > #: wineps.rc:50 > -#, fuzzy > -#| msgid "&Setup" > msgid "Setup" > -msgstr "Opp&sett" > +msgstr "Oppsett" > > #: wininet.rc:42 wininet.rc:62 > msgid "Realm" > @@ -8781,8 +8695,7 @@ msgid "" > "The specified device is already in use. Wait until it is free, and then try " > "again." > msgstr "" > -"Den oppgitte enheten er allerede i brukuse. Vent til den er ledig og prøv " > -"igjen." > +"Den oppgitte enheten er allerede i bruk. Vent til den er ledig og prøv igjen." > > #: winmm.rc:37 > msgid "The specified device handle is invalid." > @@ -8849,7 +8762,7 @@ msgid "" > "Cannot open the device without using the WAVE_ALLOWSYNC flag. Use the flag, " > "and then try again." > msgstr "" > -"Kan ikke åpne enheten uten å bruke flagget 'WAVE_ALLOWSYNC. Bruk flagget og " > +"Kan ikke åpne enheten uten å bruke flagget 'WAVE_ALLOWSYNC'. Bruk flagget og " > "prøv igjen." > > #: winmm.rc:52 > @@ -8866,7 +8779,7 @@ msgid "" > "MIDIMAP.CFG file may be corrupt or missing." > msgstr "" > "Fant ikke et MIDI-kart. Det kan være et problem med driveren, eller filen " > -"'MIDIMAP.CFG' kan være korrupt eller mangle." > +"'MIDIMAP.CFG' kan være korrupt eller mangler." > > #: winmm.rc:55 > msgid "" > @@ -8921,7 +8834,7 @@ msgid "" > "The device name is already being used as an alias by this application. Use a " > "unique alias." > msgstr "" > -"Enhetsnavnet brukes allerede som et alies av dette programmet. Bruk et unikt " > +"Enhetsnavnet brukes allerede som et alias av dette programmet. Bruk et unikt " > "alias." > > #: winmm.rc:67 > @@ -8932,7 +8845,7 @@ msgstr "" > > #: winmm.rc:68 > msgid "No command was specified." > -msgstr "Ikke kommando ble oppgitt." > +msgstr "Ingen kommando ble oppgitt." > > #: winmm.rc:69 > msgid "" > @@ -8980,7 +8893,7 @@ msgstr "MCI-enheten som brukes støtter ikke den oppgitte kommandoen." > msgid "" > "Cannot find the specified file. Make sure the path and filename are correct." > msgstr "" > -"Kunne ikke finne den oppgitte filen. Kontroller at stien og filnavnet er " > +"Kan ikke finne den oppgitte filen. Kontroller at stien og filnavnet er " > "riktig." > > #: winmm.rc:77 > @@ -8990,7 +8903,7 @@ msgstr "Enhetsdriveren er ikke klar." > #: winmm.rc:78 > msgid "A problem occurred in initializing MCI. Try restarting Windows." > msgstr "" > -"Et problem oppstod under initaliseringen av MCi. Prøv å starte Windows på " > +"Et problem oppstod under initialiseringen av MCi. Prøv å starte Windows på " > "nytt." > > #: winmm.rc:79 > @@ -9031,19 +8944,15 @@ msgid "" > "Cannot save the specified file. Make sure you have enough disk space or are " > "still connected to the network." > msgstr "" > -"Kunne ikke lagre den oppgitte filen. Kontroller at du har nok diskplass, og " > -"at du fortsatt er tilkoblet nettverket." > +"Kan ikke lagre den oppgitte filen. Kontroller at du har nok diskplass, og at " > +"du fortsatt er tilkoblet nettverket." > > #: winmm.rc:86 > -#, fuzzy > -#| msgid "" > -#| "Cannot find the specified device. Make sure it is installed or that the " > -#| "device name is spelled correctly." > msgid "" > "Cannot find the specified device. Make sure it is installed and that the " > "device name is spelled correctly." > msgstr "" > -"Fant ikke den oppgitte enheten. Kontroller at den er installert eller at " > +"Fant ikke den oppgitte enheten. Kontroller at den er installert og at " > "enhetsnavnet er riktig stavet." > > #: winmm.rc:87 > @@ -9085,7 +8994,7 @@ msgid "" > "The specified value for the time format is invalid. Refer to the MCI " > "documentation for valid formats." > msgstr "" > -"Den oppgitte vardien for tidsformatet er ugyldig. Se i MCI-dokumentasjonen " > +"Den oppgitte verdien for tidsformatet er ugyldig. Se i MCI-dokumentasjonen " > "for gyldige formater." > > #: winmm.rc:93 > @@ -9113,7 +9022,7 @@ msgstr "En nullparamterblokk ble gitt til MCI." > > #: winmm.rc:97 > msgid "Cannot save an unnamed file. Supply a filename." > -msgstr "Kan ikke lagre en fil uten avn. Oppgi et filnavn." > +msgstr "Kan ikke lagre en fil uten navn. Oppgi et filnavn." > > #: winmm.rc:98 > msgid "You must specify an alias when using the 'new' parameter." > @@ -9148,7 +9057,7 @@ msgid "" > "The filename is invalid. Make sure the filename is not longer than 8 " > "characters, followed by a period and an extension." > msgstr "" > -"Filnavnet er ugyldig. Kontroller at filnavnet ikek er lengre enn 8 tegn, " > +"Filnavnet er ugyldig. Kontroller at filnavnet ikke er lengre enn 8 tegn, " > "etterfulgt av et punktum og et etternavn." > > #: winmm.rc:104 > @@ -9170,7 +9079,7 @@ msgid "" > "Cannot access the specified file or MCI device. Try changing directories or " > "restarting your computer." > msgstr "" > -"Fikk ikke tilgang til den oppgitte filen eller MCi-enheten. Prøv å endre " > +"Fikk ikke tilgang til den oppgitte filen eller MCI-enheten. Prøv å endre " > "kataloger eller starte maskinen på nytt." > > #: winmm.rc:107 > @@ -9187,7 +9096,7 @@ msgid "" > "change drives." > msgstr "" > "Fikk ikke tilgang til den oppgitte filen eller MCI-enheten fordi programmet " > -"ikke kan endre arbeidskatalog." > +"ikke kan endre arbeidsstasjon." > > #: winmm.rc:109 > msgid "Specify a device or driver name that is less than 79 characters." > @@ -9195,7 +9104,7 @@ msgstr "Oppgi en enhet eller drivernavn som er mindre enn 79 tegn." > > #: winmm.rc:110 > msgid "Specify a device or driver name that is less than 69 characters." > -msgstr "Oppgi en enhet eller drivernavn somer mindre enn 69 tegn." > +msgstr "Oppgi en enhet eller drivernavn som er mindre enn 69 tegn." > > #: winmm.rc:111 > msgid "" > @@ -9343,24 +9252,20 @@ msgstr "" > "diskplass, og at du fortsatt er tilkoblet nettverket." > > #: winmm.rc:136 > -#, fuzzy > -#| msgid "Wine Mono Installer" > msgid "Wine Sound Mapper" > -msgstr "Installere Wine Mono" > +msgstr "Wine Sound Mapper" > > #: winmm.rc:137 > -#, fuzzy > -#| msgid "column" > msgid "Volume" > -msgstr "kolonne" > +msgstr "Volum" > > #: winmm.rc:138 > msgid "Master Volume" > -msgstr "" > +msgstr "Master volum" > > #: winmm.rc:139 > msgid "Mute" > -msgstr "" > +msgstr "Demp" > > #: winspool.rc:37 > msgid "Print to File" > @@ -9372,7 +9277,7 @@ msgstr "&Ut-fil:" > > #: winspool.rc:31 > msgid "The output file already exists. Click OK to overwrite." > -msgstr "Ut-filen finnes allerede. Velg «OK» for å overskrive den." > +msgstr "Ut-filen finnes allerede. Velg 'OK' for å overskrive den." > > #: winspool.rc:32 > msgid "Unable to create the output file." > @@ -9588,7 +9493,7 @@ msgstr "Intet minne" > > #: wldap32.rc:121 > msgid "Can't connect to the LDAP server" > -msgstr "Kunne ikke koble til LDAP-tjeneren" > +msgstr "Kan ikke koble til LDAP-tjeneren" > > #: wldap32.rc:122 > msgid "Operation not supported by this version of the LDAP protocol" > @@ -9712,7 +9617,7 @@ msgid "" > "Changes to default directory, environment variables etc made within a\n" > "called procedure are inherited by the caller.\n" > msgstr "" > -"«CALL <satsvisfilnavn>» brukes i en satsvis fil for å utføre kommandoer fra\n" > +"'CALL <satsvisfilnavn>' brukes i en satsvis fil for å utføre kommandoer fra\n" > "en annen satsvis fil. Når den satsvise filen avslutter, returneres\n" > "kontrollen til filen som kalte den. CALL-kommandoen kan gi parametere til\n" > "den kalte prosedyren.\n" > @@ -9766,13 +9671,13 @@ msgid "" > "default). The ECHO OFF command can be prevented from displaying by\n" > "preceding it with an @ sign.\n" > msgstr "" > -"«ECHO <streng> viser <streng>» på den gjeldende terminalenheten.\n" > +"'ECHO <streng>' viser <streng> på den gjeldende terminalenheten.\n" > "\n" > -"«ECHO ON» forårsaker at alle kommandoer i en satsvis fil vises på\n" > +"'ECHO ON' forårsaker at alle kommandoer i en satsvis fil vises på\n" > "terminalenheten før de kjøres.\n" > "\n" > -"«ECHO OFF» reverserer effekten av en tidligere «ECHO ON» (ECHO er OFF som\n" > -"standard). «ECHO OFF»-kommandoen kan hindres fra å vises ved å plassere\n" > +"'ECHO OFF' reverserer effekten av en tidligere 'ECHO ON' (ECHO er OFF som\n" > +"standard). 'ECHO OFF'-kommandoen kan hindres fra å vises ved å plassere\n" > "et @-tegn foran den.\n" > > #: cmd.rc:78 > @@ -9837,7 +9742,7 @@ msgid "" > msgstr "" > "IF brukes til å kjøre en kommando på betingelser.\n" > "\n" > -"Bruk:\tIF [NOT] EXIST filnavn kommando\n" > +"Bruk: IF [NOT] EXIST filnavn kommando\n" > " IF [NOT] streng1==streng2 kommando\n" > " IF [NOT] ERRORLEVEL nummer kommando\n" > "\n" > @@ -9885,7 +9790,6 @@ msgstr "" > "stasjonsbokstaver.\n" > > #: cmd.rc:142 > -#, fuzzy > msgid "" > "PATH displays or changes the cmd search path.\n" > "\n" > @@ -9899,9 +9803,9 @@ msgid "" > msgstr "" > "PATH viser eller endrer CMDs søkesti.\n" > "\n" > -"Å skrive inn PATH viser den gjeldende PATH-innstillingen (dette er i\n" > -"begynnelsen verdien oppgitt i filen «wine.conf»). Etterfølg PATH-kommandoen\n" > -"med et nytt navn for å endre innstillingen.\n" > +"Å skrive inn PATH viser den gjeldende PATH-innstillingen (opprinnelig\n" > +"hentet fra registeret). Etterfølg PATH-kommandoen med en ny verdi\n" > +"for å endre innstillingen.\n" > "\n" > "Det er også mulig å endre PATH ved å bruke miljøvariablen PATH, for " > "eksempel:\n" > @@ -9948,7 +9852,7 @@ msgstr "" > "\n" > "Følgende tegnstrenger har den spesielle betydningen som vises:\n" > "\n" > -"$$ Dollar-tegn $_ Linjemating $b Rørtegn sign (|)\n" > +"$$ Dollar-tegn $_ Linjemating $b Rørtegn (|)\n" > "$d Gjeldende dato $e Escape $g Større enn-tegn\n" > "$l Mindre enn-tegn $n Gjeldende stasjon $p Gjeldende sti\n" > "$q Likhetstegn $t Gjeldende tid $v cmd-versjon\n" > @@ -9959,7 +9863,7 @@ msgstr "" > "(som kommandoen PROMPT $p$g).\n" > "\n" > "Klartegnet kan også endres ved å endre miljøvariabelen PROMPT, så\n" > -"kommandoen «SET PROMPT=tekst» har samme effekt som «PROMPT tekst».\n" > +"kommandoen 'SET PROMPT=tekst' har samme effekt som 'PROMPT tekst'.\n" > > #: cmd.rc:173 > msgid "" > @@ -10028,7 +9932,7 @@ msgid "" > "list, so parameter 2 becomes parameter 1 and so on. It has no effect if\n" > "called from the command line.\n" > msgstr "" > -"SHIFT bruker i en satsvis fil for å fjerne den første parameteren i en\n" > +"SHIFT brukes i en satsvis fil for å fjerne den første parameteren i en\n" > "liste, sånn at parameter 2 blir parameter 1 og så videre. Det har ingen\n" > "effekt hvis det brukes fra kommandolinjen.\n" > > @@ -10075,12 +9979,12 @@ msgstr "" > "/i Start programmet med nye miljøvariabler.\n" > "/min Start programmet minimert.\n" > "/max Start programmet maksimert.\n" > -"/low Start programmet i prioritetklassen «ledig».\n" > -"/normal Start programmet i prioritetklassen «normal».\n" > -"/high Start programmet i prioritetklassen «høy».\n" > -"/realtime Start programmet i prioritetklassen «samtid».\n" > -"/abovenormal Start programmet i prioritetklassen «overnormal».\n" > -"/belownormal Start programmet i prioritetklassen «undernormal».\n" > +"/low Start programmet i prioritetklassen 'ledig'.\n" > +"/normal Start programmet i prioritetklassen 'normal'.\n" > +"/high Start programmet i prioritetklassen 'høy'.\n" > +"/realtime Start programmet i prioritetklassen 'samtid'.\n" > +"/abovenormal Start programmet i prioritetklassen 'over normal'.\n" > +"/belownormal Start programmet i prioritetklassen 'under normal'.\n" > "/node n Start programmet på angitt NUMA-node.\n" > "/affinity maske Start programmet med angitt affinitet-maske.\n" > "/wait Vent til programmet er ferdig og avslutt med\n" > @@ -10103,7 +10007,7 @@ msgid "" > "TYPE <filename> copies <filename> to the console device (or elsewhere if\n" > "redirected). No check is made that the file is readable text.\n" > msgstr "" > -"«TYPE <filnavn>» kopierer <filnavn> til konsollenheten (eller et annet sted\n" > +"'TYPE <filnavn>' kopierer <filnavn> til konsollenheten (eller et annet sted\n" > "hvis det omdirigeres). Det kontrolleres ikke om filen er leselig tekst.\n" > > #: cmd.rc:253 > @@ -10116,14 +10020,14 @@ msgid "" > "\n" > "The verify flag has no function in Wine.\n" > msgstr "" > -"VERIFY brukes til å aktivere, deaktivere eller teste «verify»-flagget.\n" > +"VERIFY brukes til å aktivere, deaktivere eller teste 'verify'-flagget.\n" > "Gyldige måter er:\n" > "\n" > "VERIFY ON\tAktiverer flagget.\n" > "VERIFY OFF\tDeaktiverer flagget.\n" > "VERIFY\t\tViser ON hvis på eller OFF hvis av.\n" > "\n" > -"«Verify»-flagget har ingen funksjon i Wine.\n" > +"'Verify'-flagget har ingen funksjon i Wine.\n" > > #: cmd.rc:256 > msgid "VER displays the version of cmd you are running.\n" > @@ -10279,12 +10183,13 @@ msgstr "" > "ATTRIB\t\tViser eller endrer DOS-filattributter\n" > "CALL\t\tKjører en satsvis fil inne i en annen\n" > "CD (CHDIR)\tEndrer arbeidskatalog\n" > +"CHOICE\t\tVenter på ett tastetrykk fra en valgbar liste\n" > "CLS\t\tTømmer konsollskjermen\n" > "COPY\t\tKopierer filer\n" > "CTTY\t\tEndrer inn/ut-enhet\n" > "DATE\t\tViser eller endrer systemdatoen\n" > "DEL (ERASE)\tSletter én eller flere filer\n" > -"DIR\t\tViser innholdet i en katalgo\n" > +"DIR\t\tViser innholdet i en katalog\n" > "ECHO\t\tKopierer tekst direkte til konsoll-utdataen\n" > "ENDLOCAL\tStopper lokalisering av endringer i miljøvariabler i en satsvis\n" > "\t\tfil\n" > @@ -10306,13 +10211,13 @@ msgstr "" > "\t\tprogrammet\n" > "TIME\t\tAngir eller viser gjeldende systemtid\n" > "TITLE\t\tAngir vindustittelen for CMD-økten\n" > -"TYPE\t\tViser innholdet i en fil\n" > +"TYPE\t\tViser innholdet i en tekstfil\n" > "VER\t\tViser CMDs versjonnummer\n" > "VOL\t\tViser volumnavnet til en diskenhet\n" > "XCOPY\t\tKopierer kildefiler eller et katalogtre til et mål\n" > "EXIT\t\tAvslutter CMD\n" > "\n" > -"Skriv «HELP <kommando>» for mer informasjon om kommandoene ovenfor\n" > +"Skriv 'HELP <kommando>' for mer informasjon om kommandoene ovenfor\n" > > #: cmd.rc:353 > msgid "Are you sure?" > @@ -10330,15 +10235,15 @@ msgstr "N" > > #: cmd.rc:356 > msgid "File association missing for extension %1\n" > -msgstr "Fant ingen filtilknytning for filtypen «%1»\n" > +msgstr "Fant ingen filtilknytning for filtypen '%1'\n" > > #: cmd.rc:357 > msgid "No open command associated with file type '%1'\n" > -msgstr "Ingen åpne-kommando er tilknyttet filtypen «%1»\n" > +msgstr "Ingen åpne-kommando er tilknyttet filtypen '%1'\n" > > #: cmd.rc:358 > msgid "Overwrite %1?" > -msgstr "Skrive over «%1»?" > +msgstr "Skrive over '%1'?" > > #: cmd.rc:359 > msgid "More..." > @@ -10358,7 +10263,7 @@ msgstr "Syntaksfeil\n" > > #: cmd.rc:365 > msgid "No help available for %1\n" > -msgstr "Ingen hjelp tilgjengelig for «%1»\n" > +msgstr "Ingen hjelp tilgjengelig for '%1'\n" > > #: cmd.rc:366 > msgid "Target to GOTO not found\n" > @@ -10382,11 +10287,11 @@ msgstr "Angi ny tid: " > > #: cmd.rc:371 > msgid "Environment variable %1 not defined\n" > -msgstr "Miljøvariabelen «%1» er ikke definert\n" > +msgstr "Miljøvariabelen '%1' er ikke definert\n" > > #: cmd.rc:372 xcopy.rc:41 > msgid "Failed to open '%1'\n" > -msgstr "Klarte ikke åpne «%1»\n" > +msgstr "Klarte ikke åpne '%1'\n" > > #: cmd.rc:373 > msgid "Cannot call batch label outside of a batch script\n" > @@ -10399,7 +10304,7 @@ msgstr "A" > > #: cmd.rc:375 > msgid "Delete %1?" > -msgstr "Slette «%1»?" > +msgstr "Slette %1?" > > #: cmd.rc:376 > msgid "Echo is %1\n" > @@ -10427,11 +10332,11 @@ msgstr "" > > #: cmd.rc:381 > msgid "Volume label (11 characters, <Enter> for none)?" > -msgstr "Volumnavn (11 tegn, Enter for intet navn)?" > +msgstr "Volumnavn (11 tegn, <Enter> for intet navn)?" > > #: cmd.rc:382 > msgid "PATH not found\n" > -msgstr "Klarte ikke finne PATH\n" > +msgstr "Fant ikke PATH\n" > > #: cmd.rc:383 > msgid "Press any key to continue... " > @@ -10472,7 +10377,7 @@ msgstr " (Ja|Nei|Alle)" > #: cmd.rc:392 > msgid "" > "Can't recognize '%1' as an internal or external command, or batch script.\n" > -msgstr "«%1» er ikke en intern eller ekstern kommando, eller en satsvis fil.\n" > +msgstr "'%1' er ikke en intern eller ekstern kommando, eller en satsvis fil.\n" > > #: cmd.rc:393 > msgid "Division by zero error.\n" > @@ -10511,8 +10416,6 @@ msgid "Wine Explorer" > msgstr "Wine Utforsker" > > #: explorer.rc:33 > -#, fuzzy > -#| msgid "StartUp" > msgid "Start" > msgstr "Start" > > @@ -10526,7 +10429,7 @@ msgstr "Bruk: hostname\n" > > #: hostname.rc:31 > msgid "Error: Invalid option '%c'.\n" > -msgstr "Feil: «%c» er et ugyldig valg.\n" > +msgstr "Feil: '%c' er et ugyldig valg.\n" > > #: hostname.rc:32 > msgid "" > @@ -10618,7 +10521,7 @@ msgstr "" > " -eller-\n" > "NET kommando /HELP\n" > "\n" > -"hvor «kommando» er HELP, START, STOP eller USE.\n" > +"hvor 'kommando' er HELP, START, STOP eller USE.\n" > > #: net.rc:31 > msgid "" > @@ -10633,8 +10536,8 @@ msgstr "" > "\n" > "NET START [tjeneste]\n" > "\n" > -"Hvis ikke «tjenste» oppgis vises alle kjørende tjenester. Ellers er " > -"«service» navnet på tjenesten som skal startes.\n" > +"Hvis ikke 'tjeneste' oppgis vises alle kjørende tjenester. Ellers er " > +"'tjeneste' navnet på tjenesten som skal startes.\n" > > #: net.rc:32 > msgid "" > @@ -10648,15 +10551,15 @@ msgstr "" > "\n" > "NET STOP tjeneste\n" > "\n" > -"Hvor «tjeneste» er navnet på tjenesten som skal stoppes.\n" > +"Hvor 'tjeneste' er navnet på tjenesten som skal stoppes.\n" > > #: net.rc:33 > msgid "Stopping dependent service: %1\n" > -msgstr "Stopper avhengig tjeneste: «%1»\n" > +msgstr "Stopper avhengig tjeneste: %1\n" > > #: net.rc:34 > msgid "Could not stop service %1\n" > -msgstr "Klarte ikke stoppe tjenesten «%1»\n" > +msgstr "Klarte ikke stoppe tjenesten '%1'\n" > > #: net.rc:35 > msgid "Could not get handle to service control manager.\n" > @@ -10668,27 +10571,27 @@ msgstr "Klarte ikke nå tjenesten.\n" > > #: net.rc:37 > msgid "The %1 service is starting.\n" > -msgstr "Tjenesten «%1» starter.\n" > +msgstr "Tjenesten '%1' starter.\n" > > #: net.rc:38 > msgid "The %1 service was started successfully.\n" > -msgstr "Tjenesten «%1» ble startet.\n" > +msgstr "Tjenesten '%1' ble startet.\n" > > #: net.rc:39 > msgid "The %1 service failed to start.\n" > -msgstr "Klarte ikke starte tjenesten «%1».\n" > +msgstr "Klarte ikke starte tjenesten '%1'.\n" > > #: net.rc:40 > msgid "The %1 service is stopping.\n" > -msgstr "Stopper tjenesten «%1».\n" > +msgstr "Stopper tjenesten '%1'.\n" > > #: net.rc:41 > msgid "The %1 service was stopped successfully.\n" > -msgstr "Tjenesten «%1» ble stoppet.\n" > +msgstr "Tjenesten '%1' ble stoppet.\n" > > #: net.rc:42 > msgid "The %1 service failed to stop.\n" > -msgstr "Klarte ikke stoppe tjenesten «%1».\n" > +msgstr "Klarte ikke stoppe tjenesten '%1'.\n" > > #: net.rc:44 > msgid "There are no entries in the list.\n" > @@ -10701,7 +10604,7 @@ msgid "" > "---------------------------------------------------------------\n" > msgstr "" > "\n" > -"Status Lokal Remote\n" > +"Status Lokal Remote\n" > "---------------------------------------------------------------\n" > > #: net.rc:46 > @@ -11022,7 +10925,7 @@ msgstr "FEIL" > > #: notepad.rc:74 > msgid "Untitled" > -msgstr "(Uten navn)" > +msgstr "Uten navn" > > #: notepad.rc:77 winedbg.rc:41 > msgid "Text files (*.txt)" > @@ -11034,7 +10937,7 @@ msgid "" > "\n" > "Do you want to create a new file?" > msgstr "" > -"Filen «%s» finnes ikke.\n" > +"Filen '%s' finnes ikke.\n" > "\n" > "Opprette en ny fil?" > > @@ -11044,13 +10947,13 @@ msgid "" > "\n" > "Would you like to save the changes?" > msgstr "" > -"Filen «%s» er endret.\n" > +"Filen '%s' er endret.\n" > "\n" > "Lagre endringene?" > > #: notepad.rc:83 > msgid "'%s' could not be found." > -msgstr "Klarte ikke finne «%s»." > +msgstr "Klarte ikke finne '%s'." > > #: notepad.rc:85 > msgid "Unicode (UTF-16)" > @@ -11073,10 +10976,10 @@ msgid "" > "one of the Unicode options in the Encoding drop down list.\n" > "Continue?" > msgstr "" > -"«%1»\n" > +"'%1'\n" > "Denne filen inneholder Unicode-tegn som vil gå tapt hvis\n" > -"den lagres med tegnkodingen «%2».\n" > -"Trykk «Avbryt» og velg et av Unicode-valgene fra listen\n" > +"den lagres med tegnkodingen '%2'.\n" > +"Trykk 'Avbryt' og velg et av Unicode-valgene fra listen\n" > "hvis du vil beholde tegnene.\n" > "Fortsette?" > > @@ -11190,7 +11093,7 @@ msgstr "Systeminnstillinger" > > #: oleview.rc:172 > msgid "&Enable Distributed COM" > -msgstr "Slå på distribu&ert COM" > +msgstr "Slå på distribu&ert COM" > > #: oleview.rc:173 > msgid "Enable &Remote Connections (Win95 only)" > @@ -11254,7 +11157,7 @@ msgstr "versjon 1.0" > > #: oleview.rc:103 > msgid "TypeLib files (*.tlb; *.olb; *.dll; *.ocx; *.exe)" > -msgstr "TypeLib-filer (*.tlb;*.olb;*.dll;*.ocx;*.exe)" > +msgstr "TypeLib-filer (*.tlb; *.olb; *.dll ;*.ocx; *.exe)" > > #: oleview.rc:106 > msgid "Bind to file via a File Moniker" > @@ -11270,7 +11173,7 @@ msgstr "Endre innstillinger for distribuert COM for hele maskinen" > > #: oleview.rc:109 > msgid "Run the Wine registry editor" > -msgstr "Kjør registerredigering" > +msgstr "Kjør Wine registerredigering" > > #: oleview.rc:110 > msgid "Quit the application. Prompts to save changes" > @@ -11407,7 +11310,7 @@ msgstr "Arvete grensesnitt" > > #: oleview.rc:127 > msgid "Save as an .IDL or .H file" > -msgstr "Lagre som en «.IDL»- eller «.H»-fil" > +msgstr "Lagre som en '.IDL'- eller '.H'-fil" > > #: oleview.rc:128 > msgid "Close window" > @@ -11459,7 +11362,7 @@ msgstr "&Minimer ved oppstart" > > #: progman.rc:47 winefile.rc:70 > msgid "&Save settings on exit" > -msgstr "Lagre innstillinger ved avslutting" > +msgstr "Lagre inn&stillinger ved avslutting" > > #: progman.rc:49 taskmgr.rc:78 taskmgr.rc:255 > msgid "&Windows" > @@ -11483,7 +11386,7 @@ msgstr "&Om Programbehandling" > > #: progman.rc:103 > msgid "Program &group" > -msgstr "PProgram&gruppe" > +msgstr "Program&gruppe" > > #: progman.rc:105 > msgid "&Program" > @@ -11661,98 +11564,81 @@ msgid "The operation completed successfully\n" > msgstr "Operasjonen ble utført\n" > > #: reg.rc:35 > -#, fuzzy > -#| msgid "Error: Invalid key name\n" > msgid "reg: Invalid key name\n" > -msgstr "Feil: Ugyldig nøkkelnavn\n" > +msgstr "reg: Ugyldig nøkkelnavn\n" > > #: reg.rc:36 > -#, fuzzy > -#| msgid "Error: Invalid command line parameters\n" > msgid "reg: Invalid command line parameters\n" > -msgstr "Feil: Ugyldige parametere på kommandolinjen\n" > +msgstr "reg: Ugyldige parametere på kommandolinjen\n" > > #: reg.rc:37 > -#, fuzzy > -#| msgid "Error: Unable to add keys to remote machine\n" > msgid "reg: Unable to access remote machine\n" > -msgstr "Feil: Kan ikke legge til nøkler på ekstern maskin\n" > +msgstr "reg: Ingen tilgang til ekstern maskin\n" > > #: reg.rc:38 > -#, fuzzy > -#| msgid "" > -#| "Error: The system was unable to find the specified registry key or value\n" > msgid "" > "reg: The system was unable to find the specified registry key or value\n" > msgstr "" > -"Feil: Systemet klarte ikke finne den angitte registernøkkelen eller -" > +"reg: Systemet klarte ikke finne den angitte registernøkkelen eller -" > "verdien\n" > > #: reg.rc:39 > -#, fuzzy > -#| msgid "Unsupported type.\n" > msgid "reg: Unsupported registry data type [%1]\n" > -msgstr "Typen støttes ikke.\n" > +msgstr "reg: Registerdatatypen støttes ikke [%1]\n" > > #: reg.rc:40 > msgid "reg: The option [/d] must be followed by a valid integer\n" > -msgstr "" > +msgstr "reg: Alternativet [/d] må etterfølges av ett gyldig heltall\n" > > #: reg.rc:41 > msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" > -msgstr "" > +msgstr "reg: Alternativet [/d] må etterfølges av en gyldig hexadesimal verdi\n" > > #: reg.rc:42 > msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" > -msgstr "" > +msgstr "reg: Uhåndtert registerdatatype [/t 0x%1!x!, /d %2]\n" > > #: reg.rc:43 > -#, fuzzy > -#| msgid "The specified file already exists. Do you want to replace it?" > msgid "The registry value '%1' already exists. Do you want to overwrite it?" > -msgstr "Filen finnes fra før. Vil du erstatte den?" > +msgstr "Registerverdien '%1' finnes fra før. Vil du erstatte den?" > > #: reg.rc:47 > msgid "The registry operation was cancelled\n" > -msgstr "" > +msgstr "Register-operasjonen ble avbrutt\n" > > #: reg.rc:48 regedit.rc:204 > msgid "(Default)" > msgstr "(Standard)" > > #: reg.rc:49 > -#, fuzzy > -#| msgid "Are you sure you want to delete these values?" > msgid "Are you sure you want to delete the registry value '%1'?" > -msgstr "Virkelig slette disse verdiene?" > +msgstr "Virkelig slette registerverdien '%1'?" > > #: reg.rc:50 > -#, fuzzy > -#| msgid "Are you sure you want to delete value '%s'?" > msgid "Are you sure you want to delete all registry values in '%1'?" > -msgstr "Virkelig slette verdien «%s»?" > +msgstr "Virkelig slette alle registerverdiene i '%1'?" > > #: reg.rc:51 > -#, fuzzy > -#| msgid "Are you sure you want to delete '%1'?" > msgid "Are you sure you want to delete the registry key '%1'?" > -msgstr "Vil du virkelig slette «%1»?" > +msgstr "Vil du virkelig slette registernøkkel '%1'?" > > #: reg.rc:52 > msgid "reg: The option [/d] must be followed by a valid string\n" > -msgstr "" > +msgstr "reg: Alternativet [/d] må etterfølges av en gyldig streng\n" > > #: reg.rc:53 > msgid "" > "reg: Unable to delete all registry values in '%1'. An unexpected error " > "occurred.\n" > -msgstr "" > +msgstr "reg: Kan ikke slette alle registerverdiene i '%1'. Ett uventet problem" > +"oppstod.\n" > > #: reg.rc:54 > msgid "" > "reg: Unable to complete the specified operation. An unexpected error " > "occurred.\n" > -msgstr "" > +msgstr "reg: Kan ikke fullføre den spesifiserte operasjonen. Ett uventet" > +"problem oppstod.\n" > > #: regedit.rc:34 > msgid "&Registry" > @@ -11916,7 +11802,7 @@ msgstr "Inneholder kommandoer for å redigere verdier og nøkler" > > #: regedit.rc:139 > msgid "Contains commands for customizing the registry window" > -msgstr "Inneholder kommanoder for å tilpasse registervinduet" > +msgstr "Inneholder kommandoer for å tilpasse registervinduet" > > #: regedit.rc:140 > msgid "Contains commands for accessing frequently used keys" > @@ -11962,7 +11848,7 @@ msgstr "(verdi ikke oppgitt)" > > #: regedit.rc:206 > msgid "(cannot display value)" > -msgstr "(klarte ikke vise verdi)" > +msgstr "(kan ikke vise verdi)" > > #: regedit.rc:207 > msgid "(unknown %d)" > @@ -11982,7 +11868,7 @@ msgstr "Fjerner nøkler fra favorittlisten" > > #: regedit.rc:166 > msgid "Shows or hides the status bar" > -msgstr "Viser eller skjuler statuslinjens" > +msgstr "Viser eller skjuler statuslinjen" > > #: regedit.rc:167 > msgid "Change position of split between two panes" > @@ -12002,7 +11888,7 @@ msgstr "Gir nytt navn til utvalget" > > #: regedit.rc:171 > msgid "Copies the name of the selected key to the clipboard" > -msgstr "Kopierer navnet til den valgte nøkkelen til utklippstavlen" > +msgstr "Kopierer navnet på den valgte nøkkelen til utklippstavlen" > > #: regedit.rc:172 > msgid "Finds a text string in a key, value or data" > @@ -12046,15 +11932,15 @@ msgstr "Skriver ut hele eller deler av registeret" > > #: regedit.rc:158 > msgid "Displays program information, version number and copyright" > -msgstr "Viser programinformasjon, versjonnummer og kopirett" > +msgstr "Viser programinformasjon, versjonnummer og opphavsrett" > > #: regedit.rc:181 > msgid "Can't query value '%s'" > -msgstr "Klarte ikke lese verdien «%s»" > +msgstr "Kan ikke lese verdien '%s'" > > #: regedit.rc:182 > msgid "Can't edit keys of this type (%u)" > -msgstr "Kan ikke redigere nøkler av typen «%u»" > +msgstr "Kan ikke redigere nøkler av typen (%u)" > > #: regedit.rc:183 > msgid "Value is too big (%u)" > @@ -12066,11 +11952,11 @@ msgstr "Bekreft sletting av verdi" > > #: regedit.rc:185 > msgid "Are you sure you want to delete value '%s'?" > -msgstr "Virkelig slette verdien «%s»?" > +msgstr "Virkelig slette verdien '%s'?" > > #: regedit.rc:189 > msgid "Search string '%s' not found" > -msgstr "Fant ikke søkestrengen «%s»" > +msgstr "Fant ikke søkestrengen '%s'" > > #: regedit.rc:186 > msgid "Are you sure you want to delete these values?" > @@ -12086,7 +11972,7 @@ msgstr "Ny verdi #%d" > > #: regedit.rc:180 > msgid "Can't query key '%s'" > -msgstr "Klarte ikke lese nøkkelen «%s»" > +msgstr "Kan ikke lese nøkkelen '%s'" > > #: regedit.rc:152 > msgid "Adds a new multi-string value" > @@ -12103,6 +11989,10 @@ msgid "" > "Provides DLL registration services.\n" > "\n" > msgstr "" > +"Wine DLL Registreringsverktøy\n" > +"\n" > +"Tilbyr DLL registreringstjenester.\n" > +"\n" > > #: regsvr32.rc:40 > msgid "" > @@ -12117,54 +12007,64 @@ msgid "" > " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" > "\n" > msgstr "" > +"Bruk:\n" > +" regsvr32 [/u] [/s] [/n] [/i[:cmdline]] DllNavn\n" > +"\n" > +"Alternativer:\n" > +" [/u] Avregistrer en tjener.\n" > +" [/s] Stille modus (ingen beskjeder vil bli vist).\n" > +" [/i] Kjør DllInstall, alternativt med [cmdline].\n" > +"\tNår brukt med [/u], vil DllInstall kjøre i avinstalleringsmodus.\n" > +" [/n] Ikke kjør DllRegisterServer. Dette alternativet må brukes sammen med " > +"[/i].\n" > +"\n" > > #: regsvr32.rc:41 > msgid "" > "regsvr32: Invalid or unrecognized switch [%1]\n" > "\n" > msgstr "" > +"regsvr32: Ugyldig eller ukjent bryter [%1]\n" > > #: regsvr32.rc:42 > -#, fuzzy > -#| msgid "Failed to open '%1'\n" > msgid "regsvr32: Failed to load DLL '%1'\n" > -msgstr "Klarte ikke åpne «%1»\n" > +msgstr "regsvr32: Klarte ikke åpne DLL '%1'\n" > > #: regsvr32.rc:43 > msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n" > -msgstr "" > +msgstr "regsvr32: '%1!S!' ikke implementert i DLL '%2'\n" > > #: regsvr32.rc:44 > msgid "regsvr32: Failed to register DLL '%1'\n" > -msgstr "" > +msgstr "regsvr32: Kan ikke registrere DLL '%1'\n" > > #: regsvr32.rc:45 > msgid "regsvr32: Successfully registered DLL '%1'\n" > -msgstr "" > +msgstr "regsvr32: Vellykket registrering av DLL '%1'\n" > > #: regsvr32.rc:46 > msgid "regsvr32: Failed to unregister DLL '%1'\n" > -msgstr "" > +msgstr "regsvr32: Kan ikke avregistrere DLL '%1'\n" > > #: regsvr32.rc:47 > msgid "regsvr32: Successfully unregistered DLL '%1'\n" > -msgstr "" > +msgstr "regsvr32: Vellykket avregistrering av DLL '%1'\n" > > #: regsvr32.rc:48 > msgid "regsvr32: Failed to install DLL '%1'\n" > -msgstr "" > +msgstr "regsvr32: Kan ikke installere DLL '%1'\n" > > #: regsvr32.rc:49 > msgid "regsvr32: Successfully installed DLL '%1'\n" > -msgstr "" > +msgstr "regsvr32: Vellykket installasjon av DLL '%1'\n" > > #: regsvr32.rc:50 > msgid "regsvr32: Failed to uninstall DLL '%1'\n" > -msgstr "" > +msgstr "regsvr32: Kan ikke avinstallere DLL '%1'\n" > > #: regsvr32.rc:51 > msgid "regsvr32: Successfully uninstalled DLL '%1'\n" > -msgstr "" > +msgstr "regsvr32: Vellykket avinstallasjon av DLL '%1'\n" > > #: start.rc:58 > msgid "" > @@ -12198,7 +12098,7 @@ msgstr "Feil: /im eller /pid må oppgis.\n" > > #: taskkill.rc:34 > msgid "Error: Option %1 expects a command line parameter.\n" > -msgstr "Feil: Valget «%1» krever en kommandolinje-parameter.\n" > +msgstr "Feil: Valget '%1' krever en kommandolinje-parameter.\n" > > #: taskkill.rc:35 > msgid "Error: Options /im and /pid are mutually exclusive.\n" > @@ -12214,8 +12114,8 @@ msgstr "" > msgid "" > "Close message sent to top-level windows of process \"%1\" with PID %2!u!.\n" > msgstr "" > -"Avslutningsmelding ble sendt til toppnivå-vinduer til prosessen «%1» med PID " > -"%2!u!.\n" > +"Avslutningsmelding ble sendt til toppnivå-vinduer til prosessen \"%1\" med " > +"PID %2!u!.\n" > > #: taskkill.rc:38 > msgid "Process with PID %1!u! was forcibly terminated.\n" > @@ -12223,11 +12123,11 @@ msgstr "Tvang avslutning av prosessen med PID %1!u!.\n" > > #: taskkill.rc:39 > msgid "Process \"%1\" with PID %2!u! was forcibly terminated.\n" > -msgstr "Tvang avslutning av prosessen «%1» med PID %2!u!.\n" > +msgstr "Tvang avslutning av prosessen \"%1\" med PID %2!u!.\n" > > #: taskkill.rc:40 > msgid "Error: Could not find process \"%1\".\n" > -msgstr "Feil: Klarte ikke finne prosessen «%1».\n" > +msgstr "Feil: Klarte ikke finne prosessen \"%1\".\n" > > #: taskkill.rc:41 > msgid "Error: Unable to enumerate the process list.\n" > @@ -12235,7 +12135,7 @@ msgstr "Feil: Klarte ikke fylle ut prosesslisten.\n" > > #: taskkill.rc:42 > msgid "Error: Unable to terminate process \"%1\".\n" > -msgstr "Feil: Klarte ikke stoppe prosessen «%1».\n" > +msgstr "Feil: Klarte ikke stoppe prosessen \"%1\".\n" > > #: taskkill.rc:43 > msgid "Error: Process self-termination is not permitted.\n" > @@ -12415,7 +12315,7 @@ msgstr "Kjerneminne (kB)" > > #: taskmgr.rc:378 taskmgr.rc:290 > msgid "Handles" > -msgstr "Handles" > +msgstr "Referanser" > > #: taskmgr.rc:379 taskmgr.rc:291 > msgid "Threads" > @@ -12439,15 +12339,15 @@ msgstr "Topp" > > #: taskmgr.rc:398 > msgid "System Cache" > -msgstr "System" > +msgstr "Hurtigbufret" > > #: taskmgr.rc:406 > msgid "Paged" > -msgstr "Paginert" > +msgstr "Sidevekslet" > > #: taskmgr.rc:407 > msgid "Nonpaged" > -msgstr "Ikke paginert" > +msgstr "Ikke sidevekslet" > > #: taskmgr.rc:414 > msgid "CPU usage history" > @@ -12672,11 +12572,11 @@ msgstr "Størrelse på &virtuelt minne" > > #: taskmgr.rc:551 > msgid "Pa&ged Pool" > -msgstr "Pa&ginert samling" > +msgstr "&Sidevekslet brønn" > > #: taskmgr.rc:553 > msgid "N&on-paged Pool" > -msgstr "&Ikke-paginert samling" > +msgstr "&Ikke-sidevekslet brønn" > > #: taskmgr.rc:555 > msgid "Base P&riority" > @@ -12729,7 +12629,7 @@ msgstr "Oppgavebehandler minimeres når du bytter til en annen prosess" > > #: taskmgr.rc:191 > msgid "Hide the Task Manager when it is minimized" > -msgstr "Skjul oppgavebehandleren skjules nå rden minimeres" > +msgstr "Skjul oppgavebehandleren når den minimeres" > > #: taskmgr.rc:192 > msgid "Force Task Manager to update now, regardless of Update Speed setting" > @@ -12794,7 +12694,7 @@ msgstr "Viser hjelpeemner om oppgavebehandleren" > > #: taskmgr.rc:212 > msgid "Displays program information, version number, and copyright" > -msgstr "Viser programinformasjon, versjonnumme og kopirett" > +msgstr "Viser programinformasjon, versjonnummer og opphavsrett" > > #: taskmgr.rc:213 > msgid "Exits the Task Manager application" > @@ -12976,7 +12876,7 @@ msgstr "" > > #: taskmgr.rc:305 > msgid "Unable to Change Priority" > -msgstr "Klarte ikke endre prioriteten" > +msgstr "Kan ikke endre prioriteten" > > #: taskmgr.rc:310 > msgid "" > @@ -13018,7 +12918,7 @@ msgstr "Ugyldig valg" > > #: taskmgr.rc:317 > msgid "Unable to Access or Set Process Affinity" > -msgstr "Klarte ikke lese eller endre tilhørighet til prosessor" > +msgstr "Klarte ikke lese eller endre tilhørighet til prosessen" > > #: taskmgr.rc:322 > msgid "System Idle Process" > @@ -13052,18 +12952,17 @@ msgstr "" > > #: uninstaller.rc:31 > msgid "uninstaller: The application with GUID '%1' was not found\n" > -msgstr "" > +msgstr "uninstaller: Programmet med GUID '%1' ble ikke funnet\n" > > #: uninstaller.rc:32 > msgid "" > "uninstaller: The option '--remove' must be followed by an application GUID\n" > msgstr "" > +"uninstaller: Alternativet '--remove' må etterfølges av en program GUID\n" > > #: uninstaller.rc:33 > -#, fuzzy > -#| msgid "Error: Invalid option '%c'.\n" > msgid "uninstaller: Invalid option [%1]\n" > -msgstr "Feil: «%c» er et ugyldig valg.\n" > +msgstr "uninstaller: [%1] er et ugyldig valg.\n" > > #: uninstaller.rc:35 > msgid "" > @@ -13072,6 +12971,10 @@ msgid "" > "Uninstall applications from the current Wine prefix.\n" > "\n" > msgstr "" > +"Avinstaller programmer\n" > +"\n" > +"Avinstaller programmer fra det nåværende Wine prefixet.\n" > +"\n" > > #: uninstaller.rc:43 > msgid "" > @@ -13086,6 +12989,16 @@ msgid "" > " [no option] Launch the graphical version of this program.\n" > "\n" > msgstr "" > +"Bruk:\n" > +" uninstaller [alternativer]\n" > +"\n" > +"Alternativer:\n" > +" --help\t Vis denne informasjonen.\n" > +" --list\t Vis alle programmene installert i dette Wine prefixet.\n" > +" --remove {GUID} Avinstaller det spesifiserte programmet.\n" > +"\t\t Bruk '--list' for å avgjøre programmets GUID.\n" > +" [intet valg] Kjør det grafiske brukergrensesnittet.\n" > +"\n" > > #: view.rc:36 > msgid "&Pan" > @@ -13129,7 +13042,7 @@ msgstr "" > > #: wineboot.rc:46 > msgid "The Wine configuration in %s is being updated, please wait..." > -msgstr "Vent mens Wine-oppsettet i «%s» blir oppdatert..." > +msgstr "Vent mens Wine-oppsettet i %s blir oppdatert..." > > #: winecfg.rc:141 > msgid "" > @@ -13138,9 +13051,9 @@ msgid "" > "Free Software Foundation; either version 2.1 of the License, or (at your " > "option) any later version." > msgstr "" > -"Dette biblioteket er fri programvarer; det kan redistribueres i henhold til " > -"vilkårene i GNU Lesser General Public License utgitt av «the Free Software " > -"Foundation», enten versjon 2.1 av denne Lisensen, eller (hvis du ønsker det) " > +"Dette programmet er fri programvare; det kan redistribueres i henhold til " > +"vilkårene i GNU Lesser General Public License utgitt av Free Software " > +"Foundation, enten versjon 2.1 av denne Lisensen, eller (hvis du ønsker det) " > "en nyere versjon." > > #: winecfg.rc:143 > @@ -13149,11 +13062,11 @@ msgstr "Brukerinformasjon for Windows" > > #: winecfg.rc:144 > msgid "&Owner:" > -msgstr "Eier:" > +msgstr "&Eier:" > > #: winecfg.rc:146 > msgid "Organi&zation:" > -msgstr "Organisasjon:" > +msgstr "Organi&sasjon:" > > #: winecfg.rc:154 > msgid "Application settings" > @@ -13170,8 +13083,6 @@ msgstr "" > "innstillinger for hele systemet eller enkelte programmer der også." > > #: winecfg.rc:159 > -#, fuzzy > -#| msgid "&Add application..." > msgid "Add appli&cation..." > msgstr "Legg til progr&am..." > > @@ -13197,15 +13108,15 @@ msgstr "Tillat vindusbehandleren å &dekorere vinduer" > > #: winecfg.rc:172 > msgid "Allow the &window manager to control the windows" > -msgstr "Tillat vindusbehandleren å kontrollere vinduene" > +msgstr "Tillat &vindusbehandleren å kontrollere vinduene" > > #: winecfg.rc:173 > msgid "&Emulate a virtual desktop" > -msgstr "Vis et virtuelt skrivebord" > +msgstr "Vis &et virtuelt skrivebord" > > #: winecfg.rc:175 > msgid "Desktop &size:" > -msgstr "Størrelse:" > +msgstr "&Størrelse:" > > #: winecfg.rc:180 > msgid "Screen resolution" > @@ -13231,15 +13142,15 @@ msgstr "" > > #: winecfg.rc:194 > msgid "&New override for library:" > -msgstr "Ny overstyring for bibliotek:" > +msgstr "&Ny overstyring for bibliotek:" > > #: winecfg.rc:196 > msgid "A&dd" > -msgstr "" > +msgstr "&Legg til" > > #: winecfg.rc:197 > msgid "Existing &overrides:" > -msgstr "Gjeldende overstyringer:" > +msgstr "Gjeldende &overstyringer:" > > #: winecfg.rc:199 > msgid "&Edit..." > @@ -13262,14 +13173,12 @@ msgid "&Native (Windows)" > msgstr "I&nnfødt (Windows)" > > #: winecfg.rc:211 > -#, fuzzy > -#| msgid "Bui&ltin then Native" > msgid "Buil&tin then Native" > -msgstr "&Innebygget så innfødt" > +msgstr "Innebygge&t så innfødt" > > #: winecfg.rc:212 > msgid "Nati&ve then Builtin" > -msgstr "Innfdø&dt så innebygget" > +msgstr "Innfød&dt så innebygget" > > #: winecfg.rc:220 > msgid "Select Drive Letter" > @@ -13288,26 +13197,20 @@ msgstr "" > "redigeres." > > #: winecfg.rc:236 > -#, fuzzy > -#| msgid "&Add..." > msgid "A&dd..." > msgstr "&Legg til..." > > #: winecfg.rc:238 > -#, fuzzy > -#| msgid "Autodetect" > msgid "Aut&odetect" > -msgstr "Finn automatisk" > +msgstr "Finn aut&omatisk" > > #: winecfg.rc:241 > msgid "&Path:" > msgstr "&Sti:" > > #: winecfg.rc:248 winecfg.rc:38 > -#, fuzzy > -#| msgid "Show &Advanced" > msgid "Show Advan&ced" > -msgstr "Avansert visning" > +msgstr "Avansert &visning" > > #: winecfg.rc:249 > msgid "De&vice:" > @@ -13326,10 +13229,8 @@ msgid "S&erial:" > msgstr "S&erienummer:" > > #: winecfg.rc:258 > -#, fuzzy > -#| msgid "Show &dot files" > msgid "&Show dot files" > -msgstr "Vis .-filer" > +msgstr "Vi&s .-filer" > > #: winecfg.rc:265 > msgid "Driver diagnostics" > @@ -13360,14 +13261,12 @@ msgid "&Test Sound" > msgstr "&Test" > > #: winecfg.rc:277 winecfg.rc:90 > -#, fuzzy > -#| msgid "Wine configuration" > msgid "Speaker configuration" > -msgstr "Oppsett av Wine" > +msgstr "Høytaleroppsett" > > #: winecfg.rc:280 > msgid "Speakers:" > -msgstr "" > +msgstr "Høytalere:" > > #: winecfg.rc:288 > msgid "Appearance" > @@ -13375,19 +13274,19 @@ msgstr "Utseende" > > #: winecfg.rc:289 > msgid "&Theme:" > -msgstr "Tema:" > +msgstr "&Tema:" > > #: winecfg.rc:291 > msgid "&Install theme..." > -msgstr "Installer tema..." > +msgstr "&Installer tema..." > > #: winecfg.rc:296 > msgid "It&em:" > -msgstr "Element:" > +msgstr "&Element:" > > #: winecfg.rc:298 > msgid "C&olor:" > -msgstr "Farge:" > +msgstr "&Farge:" > > #: winecfg.rc:304 > msgid "Folders" > @@ -13395,7 +13294,7 @@ msgstr "Mappe" > > #: winecfg.rc:307 > msgid "&Link to:" > -msgstr "Pek til:" > +msgstr "Pek ti&l:" > > #: winecfg.rc:34 > msgid "Libraries" > @@ -13410,10 +13309,8 @@ msgid "Select the Unix target directory, please." > msgstr "Velg Unix-målkatalogen." > > #: winecfg.rc:37 > -#, fuzzy > -#| msgid "Hide &Advanced" > msgid "Hide Advan&ced" > -msgstr "Enkel visning" > +msgstr "Enkel &visning" > > #: winecfg.rc:39 > msgid "(No Theme)" > @@ -13457,7 +13354,7 @@ msgstr "Peker til" > > #: winecfg.rc:45 > msgid "Wine configuration for %s" > -msgstr "Oppsett av Wine for «%s»" > +msgstr "Oppsett av Wine for %s" > > #: winecfg.rc:84 > msgid "Selected driver: %s" > @@ -13477,21 +13374,19 @@ msgstr "(Standard)" > > #: winecfg.rc:91 > msgid "5.1 Surround" > -msgstr "" > +msgstr "5.1 Surround" > > #: winecfg.rc:92 > -#, fuzzy > -#| msgid "graphic" > msgid "Quadraphonic" > -msgstr "grafikk" > +msgstr "Quadraphonic" > > #: winecfg.rc:93 > msgid "Stereo" > -msgstr "" > +msgstr "Stereo" > > #: winecfg.rc:94 > msgid "Mono" > -msgstr "" > +msgstr "Mono" > > #: winecfg.rc:54 > msgid "" > @@ -13604,7 +13499,7 @@ msgid "" > msgstr "" > "Du har ikke en C-stasjon. Det er ikke så bra.\n" > "\n" > -"Husk å trykke «Legg til» i stasjonsfanen for å lage en!\n" > +"Husk å trykke 'Legg til' i stasjonsfanen for å lage en!\n" > > #: winecfg.rc:99 > msgid "Controls Background" > @@ -13644,11 +13539,11 @@ msgstr "Tekst i verktøytips" > > #: winecfg.rc:109 > msgid "Window Background" > -msgstr "Vindubakgrunn" > +msgstr "Vindusbakgrunn" > > #: winecfg.rc:110 > msgid "Window Text" > -msgstr "Vinduteksts" > +msgstr "Vindusteksts" > > #: winecfg.rc:111 > msgid "Active Title Bar" > @@ -13676,7 +13571,7 @@ msgstr "Arbeidsområde i program" > > #: winecfg.rc:117 > msgid "Window Frame" > -msgstr "Visrusramme" > +msgstr "Vindusramme" > > #: winecfg.rc:118 > msgid "Active Border" > @@ -13751,16 +13646,12 @@ msgid "Command history" > msgstr "Kommandohistorikk" > > #: wineconsole.rc:69 > -#, fuzzy > -#| msgid "Buffer zone" > msgid "&Buffer size:" > -msgstr "Hurtigminnesone" > +msgstr "&Bufferstørrelse:" > > #: wineconsole.rc:72 > -#, fuzzy > -#| msgid "&Remove doubles" > msgid "&Remove duplicates" > -msgstr "Fje&rn doble" > +msgstr "Fje&rn duplikater" > > #: wineconsole.rc:74 > msgid "Popup menu" > @@ -13775,22 +13666,16 @@ msgid "S&hift" > msgstr "S&kift" > > #: wineconsole.rc:78 > -#, fuzzy > -#| msgid "&Close console" > msgid "Console" > -msgstr "&Lukk konsoll" > +msgstr "Konsoll" > > #: wineconsole.rc:79 > -#, fuzzy > -#| msgid "Quick edit" > msgid "&Quick Edit mode" > -msgstr "Rask redigering" > +msgstr "Rask redigerings&modus" > > #: wineconsole.rc:80 > -#, fuzzy > -#| msgid "&Expert mode" > msgid "&Insert mode" > -msgstr "&Ekspertmodus" > +msgstr "&Innrykksmodus" > > #: wineconsole.rc:88 > msgid "&Font" > @@ -13885,12 +13770,11 @@ msgid "Configuration error" > msgstr "Konfigurasjonsfeil" > > #: wineconsole.rc:42 > -#, fuzzy > -#| msgid "Screen buffer size must be greater or equal to the window's one" > msgid "" > "The size of the screen buffer must be greater than or equal to the size of " > "the window." > -msgstr "Skjermens hurtigminnestørrelse må være større eller lik vinduets" > +msgstr "Størrelsen på skjermbufferen må være større eller lik størrelsen på" > +"vinduet." > > #: wineconsole.rc:37 > msgid "Each character is %1!u! pixels wide and %2!u! pixels high" > @@ -13902,7 +13786,7 @@ msgstr "Dette er en test" > > #: wineconsole.rc:44 > msgid "wineconsole: Couldn't parse event id\n" > -msgstr "wineconsole: Klarte ikke lese hendelse-id\n" > +msgstr "wineconsole: Klarte ikke lese hendelses-id\n" > > #: wineconsole.rc:45 > msgid "wineconsole: Invalid backend\n" > @@ -13945,14 +13829,14 @@ msgid "" > " try to setup the current terminal as a Wine " > "console.\n" > msgstr "" > -" --backend={user|curses} «user» lager et nytt vindu, mens «curses»\n" > +" --backend={user|curses} 'user' lager et nytt vindu, mens 'curses'\n" > " prøver å bruke gjeldende terminal som Wine-" > "konsoll\n" > > #: wineconsole.rc:53 > msgid " <command> The Wine program to launch in the console.\n" > msgstr "" > -" <kommando> Wine-programmet som skal kjøres i konsollet.\n" > +" <kommando> Wine-programmet som skal kjøres i konsollen.\n" > > #: wineconsole.rc:54 > msgid "" > @@ -13965,7 +13849,7 @@ msgstr "" > "\n" > "Eksempel:\n" > " wineconsole cmd\n" > -"Starter Wine-ledeteksten i et Wine-konsoll.\n" > +"Starter Wine-ledeteksten i en Wine-konsoll.\n" > "\n" > > #: winedbg.rc:49 > @@ -14007,7 +13891,7 @@ msgid "" > msgstr "" > "Hvis dette problemet ikke oppstår i Windows og ikke har blitt rapportert " > "ennå, så kan du lagre detaljert informasjon til en fil ved å trykke på " > -"«Lagre som»-knappen. Deretter kan du <a href=\"http://wiki.winehq.org/Bugs" > +"\"Lagre som\"-knappen. Deretter kan du <a href=\"http://wiki.winehq.org/Bugs" > "\">opprette en feilrapport</a> og legge ved loggfilen." > > #: winedbg.rc:38 > @@ -14112,7 +13996,7 @@ msgstr "&Om Wine Filbehandling" > > #: winefile.rc:125 > msgid "Select destination" > -msgstr "Velg plasserings" > +msgstr "Velg plassering" > > #: winefile.rc:138 > msgid "By File Type" > @@ -14148,7 +14032,7 @@ msgstr "&Filnavn:" > > #: winefile.rc:165 > msgid "Full &Path:" > -msgstr "&Full sti:" > +msgstr "F&ull sti:" > > #: winefile.rc:167 > msgid "Last Change:" > @@ -14156,7 +14040,7 @@ msgstr "Sist endret:" > > #: winefile.rc:171 > msgid "Cop&yright:" > -msgstr "&Kopirett:" > +msgstr "Oppha&vsrett:" > > #: winefile.rc:173 > msgid "Size:" > @@ -14340,7 +14224,7 @@ msgstr "Ingen" > > #: winemine.rc:32 > msgid "Copyright 2000 Joshua Thielen" > -msgstr "Kopirett 2000 tilhører Joshua Thielen" > +msgstr "Opphavsrett 2000 tilhører Joshua Thielen" > > #: winhlp32.rc:35 > msgid "Printer &setup..." > @@ -14408,11 +14292,11 @@ msgstr "Hjelp" > > #: winhlp32.rc:86 > msgid "Error while reading the help file `%s'" > -msgstr "Klarte ikke lese hjelpefilen «%s»" > +msgstr "Klarte ikke lese hjelpefilen '%s'" > > #: winhlp32.rc:88 > msgid "Summary" > -msgstr "&Oppsummering" > +msgstr "Oppsummering" > > #: winhlp32.rc:87 > msgid "&Index" > @@ -14424,7 +14308,7 @@ msgstr "Hjelp-filer (*.hlp)" > > #: winhlp32.rc:92 > msgid "Cannot find '%s'. Do you want to find this file yourself?" > -msgstr "Klarte ikke finne «%s». Vil du finne filen selv?" > +msgstr "Klarte ikke finne '%s'. Vil du finne filen selv?" > > #: winhlp32.rc:93 > msgid "Cannot find a richedit implementation... Aborting" > @@ -14608,7 +14492,7 @@ msgstr "Linjebryting" > > #: wordpad.rc:260 > msgid "&No line wrapping" > -msgstr "Ingen linjebryting" > +msgstr "I&ngen linjebryting" > > #: wordpad.rc:261 > msgid "Wrap text by the &window border" > @@ -14758,7 +14642,7 @@ msgstr "Dokument" > > #: wordpad.rc:184 > msgid "Save changes to '%s'?" > -msgstr "Lagre endringer i «%s»?" > +msgstr "Lagre endringer i '%s'?" > > #: wordpad.rc:185 > msgid "Finished searching the document." > @@ -14814,15 +14698,15 @@ msgstr "Klarte ikke starte Wordpad" > > #: xcopy.rc:30 > msgid "Invalid number of parameters - Use xcopy /? for help\n" > -msgstr "Ugyldig antall parametere; bruk «xcopy /?» for hjelp\n" > +msgstr "Ugyldig antall parametere; bruk 'xcopy /?' for hjelp\n" > > #: xcopy.rc:31 > msgid "Invalid parameter '%1' - Use xcopy /? for help\n" > -msgstr "Ugyldig parameter «%1»; bruk «xcopy /?» for hjelp\n" > +msgstr "Ugyldig parameter '%1'; bruk 'xcopy /?' for hjelp\n" > > #: xcopy.rc:32 > msgid "Press <Enter> to begin copying\n" > -msgstr "Trykk Enter for å starte kopieringen\n" > +msgstr "Trykk <Enter> for å starte kopieringen\n" > > #: xcopy.rc:33 > msgid "%1!d! file(s) would be copied\n" > @@ -14838,7 +14722,7 @@ msgid "" > "on the target?\n" > "(F - File, D - Directory)\n" > msgstr "" > -"Er «%1» et filnavn eller katalog\n" > +"Er '%1' et filnavn eller katalog\n" > "i målet?\n" > "(F - Fil, K - Katalog)\n" > > @@ -14848,15 +14732,15 @@ msgstr "%1? (Ja|Nei)\n" > > #: xcopy.rc:39 > msgid "Overwrite %1? (Yes|No|All)\n" > -msgstr "Skrive over «%1»? (Ja|Nei|Alle)\n" > +msgstr "Skrive over '%1'? (Ja|Nei|Alle)\n" > > #: xcopy.rc:40 > msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" > -msgstr "Klarte ikke kopiere «%1» til «%2»; feilet med r/c %3!d!\n" > +msgstr "Klarte ikke kopiere '%1' til '%2'; feilet med r/c %3!d!\n" > > #: xcopy.rc:42 > msgid "Failed during reading of '%1'\n" > -msgstr "Klarte ikke lese «%1»\n" > +msgstr "Klarte ikke lese '%1'\n" > > #: xcopy.rc:46 > msgctxt "File key" > @@ -14929,7 +14813,7 @@ msgstr "" > "[/H] Kopier skjulte filer og systemfiler\n" > "[/C] Fortsett selv om det oppstår feil under kopieringen.\n" > "[/A] Bare kopier filer som er markert som arkiv.\n" > -"[/M] Bare kopier filer som er markert som akriv; fjern denne\n" > +"[/M] Bare kopier filer som er markert som arkiv; fjern denne\n" > "\tmerkingen etterpå.\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"

1 0

Re: Assorted typos fixes
by Sebastian Lackner 30 Apr '16

30 Apr '16

On 30.04.2016 15:10, Andrey Gusev wrote: > I fear you'll have to split it per DLL, as also requested for other typo fix patches recently.

1 0

Re: Assorted typos fixes
by Marvin 30 Apr '16

30 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22769 Your paranoid android. === w864 (32 bit d3d) === d3d.c:2326: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2510: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2657: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level === w1064 (32 bit d3d) === d3d.c:2326: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2510: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2657: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level

1 0

Re: Assorted typos fixes
by Marvin 30 Apr '16

30 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22768 Your paranoid android. === w1064 (32 bit crypt) === crypt.c:1024: Test failed: Expected 00010000, got ffffffff crypt.c:1024: Test failed: Expected 00010001, got ffffffff === w1064 (64 bit crypt) === crypt.c:1024: Test failed: Expected 00010000, got ffffffff crypt.c:1024: Test failed: Expected 00010001, got ffffffff

1 0

Re: [PATCH 2/4] d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage.
by Stefan Dösinger 30 Apr '16

30 Apr '16

> Am 28.04.2016 um 20:17 schrieb Aaryaman Vasishta <jem456.vasishta(a)gmail.com>: > > + if (texture->d3drm && texture->initialized) > + IDirect3DRM_Release(texture->d3drm); I thought the idea was to use AddDestroyCallback instead of a flag to control the Release call. Do I remember this incorrectly, or what's the reason for going back to a flag? Also, what's the difference between image != NULL and initialized? Or, in a later stage when you have initFromTexture or what it is called, image != NULL || ddraw_texture != NULL? > IDirect3DRM_AddRef(texture->d3drm); > + > + if (texture->image) > + return D3DRMERR_BADOBJECT; Afair the ref leak here is intentional. If it is, I think it's worth adding a comment.

3 4

Re: [PATCH 3/3] user32/tests: Added PrivateExtractIcons test.
by Marvin 29 Apr '16

29 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22747 Your paranoid android. === w864 (32 bit cursoricon) === cursoricon.c:1436: Test failed: Create cursor failed. cursoricon.c:1441: Test failed: GetIconInfo() failed. cursoricon.c:1443: Test failed: Last error: 1402 cursoricon.c:1458: Test failed: DestroyCursor() failed. cursoricon.c:1460: Test failed: Last error: 1402 cursoricon.c:1593: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1600: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1601: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0x0). cursoricon.c:1602: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 1). cursoricon.c:1608: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1620: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1626: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1660: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1666: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1672: Test failed: Unexpected number of steps in cursor (0 != 1) cursoricon.c:1679: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1681: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1682: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1685: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != ~0). cursoricon.c:1702: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1714: Test failed: Create cursor failed (error = deadbeef). cursoricon.c:1720: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xc0de). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xcafe). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbabe). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1745: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:2622: Test failed: LoadImage() failed with 0. cursoricon.c:2622: Test failed: LoadImage() failed with 0. === w1064 (32 bit cursoricon) === cursoricon.c:1436: Test failed: Create cursor failed. cursoricon.c:1441: Test failed: GetIconInfo() failed. cursoricon.c:1443: Test failed: Last error: 1402 cursoricon.c:1458: Test failed: DestroyCursor() failed. cursoricon.c:1460: Test failed: Last error: 1402 cursoricon.c:1593: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1600: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1601: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0x0). cursoricon.c:1602: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 1). cursoricon.c:1608: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1620: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1626: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1660: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1666: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1672: Test failed: Unexpected number of steps in cursor (0 != 1) cursoricon.c:1679: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1681: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1682: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1685: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != ~0). cursoricon.c:1702: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1714: Test failed: Create cursor failed (error = deadbeef). cursoricon.c:1720: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xc0de). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xcafe). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbabe). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1745: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:2622: Test failed: LoadImage() failed with 0. cursoricon.c:2622: Test failed: LoadImage() failed with 0. === w864 (64 bit cursoricon) === cursoricon.c:1436: Test failed: Create cursor failed. cursoricon.c:1441: Test failed: GetIconInfo() failed. cursoricon.c:1443: Test failed: Last error: 1402 cursoricon.c:1458: Test failed: DestroyCursor() failed. cursoricon.c:1460: Test failed: Last error: 1402 cursoricon.c:1593: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1600: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1601: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0x0). cursoricon.c:1602: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 1). cursoricon.c:1608: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1620: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1626: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1660: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1666: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1672: Test failed: Unexpected number of steps in cursor (0 != 1) cursoricon.c:1679: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1681: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1682: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1685: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != ~0). cursoricon.c:1702: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1714: Test failed: Create cursor failed (error = deadbeef). cursoricon.c:1720: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xc0de). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xcafe). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbabe). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1745: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:2622: Test failed: LoadImage() failed with 0. cursoricon.c:2622: Test failed: LoadImage() failed with 0. === w1064 (64 bit cursoricon) === cursoricon.c:1436: Test failed: Create cursor failed. cursoricon.c:1441: Test failed: GetIconInfo() failed. cursoricon.c:1443: Test failed: Last error: 1402 cursoricon.c:1458: Test failed: DestroyCursor() failed. cursoricon.c:1460: Test failed: Last error: 1402 cursoricon.c:1593: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1600: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1601: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0x0). cursoricon.c:1602: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 1). cursoricon.c:1608: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1620: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1626: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1660: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1666: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1672: Test failed: Unexpected number of steps in cursor (0 != 1) cursoricon.c:1679: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1681: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1682: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1685: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != ~0). cursoricon.c:1702: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1714: Test failed: Create cursor failed (error = deadbeef). cursoricon.c:1720: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xc0de). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xcafe). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbabe). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1745: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:2622: Test failed: LoadImage() failed with 0. cursoricon.c:2622: Test failed: LoadImage() failed with 0.

1 0

Re: [PATCH 1/3] user32/tests: Moved creating .ico file into a helper function.
by Marvin 29 Apr '16

29 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22746 Your paranoid android. === w864 (32 bit cursoricon) === cursoricon.c:1436: Test failed: Create cursor failed. cursoricon.c:1441: Test failed: GetIconInfo() failed. cursoricon.c:1443: Test failed: Last error: 1402 cursoricon.c:1458: Test failed: DestroyCursor() failed. cursoricon.c:1460: Test failed: Last error: 1402 cursoricon.c:1593: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1600: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1601: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0x0). cursoricon.c:1602: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 1). cursoricon.c:1608: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1620: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1626: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1660: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1666: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1672: Test failed: Unexpected number of steps in cursor (0 != 1) cursoricon.c:1679: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1681: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1682: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1685: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != ~0). cursoricon.c:1702: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1714: Test failed: Create cursor failed (error = deadbeef). cursoricon.c:1720: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xc0de). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xcafe). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbabe). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1745: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:2603: Test failed: LoadImage() failed with 0. cursoricon.c:2603: Test failed: LoadImage() failed with 0. === w1064 (32 bit cursoricon) === cursoricon.c:1436: Test failed: Create cursor failed. cursoricon.c:1441: Test failed: GetIconInfo() failed. cursoricon.c:1443: Test failed: Last error: 1402 cursoricon.c:1458: Test failed: DestroyCursor() failed. cursoricon.c:1460: Test failed: Last error: 1402 cursoricon.c:1593: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1600: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1601: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0x0). cursoricon.c:1602: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 1). cursoricon.c:1608: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1620: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1626: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1660: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1666: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1672: Test failed: Unexpected number of steps in cursor (0 != 1) cursoricon.c:1679: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1681: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1682: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1685: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != ~0). cursoricon.c:1702: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1714: Test failed: Create cursor failed (error = deadbeef). cursoricon.c:1720: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xc0de). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xcafe). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbabe). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1745: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:2603: Test failed: LoadImage() failed with 0. cursoricon.c:2603: Test failed: LoadImage() failed with 0. === w864 (64 bit cursoricon) === cursoricon.c:1436: Test failed: Create cursor failed. cursoricon.c:1441: Test failed: GetIconInfo() failed. cursoricon.c:1443: Test failed: Last error: 1402 cursoricon.c:1458: Test failed: DestroyCursor() failed. cursoricon.c:1460: Test failed: Last error: 1402 cursoricon.c:1593: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1600: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1601: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0x0). cursoricon.c:1602: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 1). cursoricon.c:1608: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1620: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1626: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1660: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1666: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1672: Test failed: Unexpected number of steps in cursor (0 != 1) cursoricon.c:1679: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1681: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1682: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1685: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != ~0). cursoricon.c:1702: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1714: Test failed: Create cursor failed (error = deadbeef). cursoricon.c:1720: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xc0de). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xcafe). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbabe). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1745: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:2603: Test failed: LoadImage() failed with 0. cursoricon.c:2603: Test failed: LoadImage() failed with 0. === w1064 (64 bit cursoricon) === cursoricon.c:1436: Test failed: Create cursor failed. cursoricon.c:1441: Test failed: GetIconInfo() failed. cursoricon.c:1443: Test failed: Last error: 1402 cursoricon.c:1458: Test failed: DestroyCursor() failed. cursoricon.c:1460: Test failed: Last error: 1402 cursoricon.c:1593: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1600: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1601: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0x0). cursoricon.c:1602: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 1). cursoricon.c:1608: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1620: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1626: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1635: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1637: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1638: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1641: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1660: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1666: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1672: Test failed: Unexpected number of steps in cursor (0 != 1) cursoricon.c:1679: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1681: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1682: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1685: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != ~0). cursoricon.c:1702: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1714: Test failed: Create cursor failed (error = deadbeef). cursoricon.c:1720: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xc0de). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xcafe). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1731: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1472: Test failed: GetIconInfo() failed cursoricon.c:1733: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1734: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbabe). cursoricon.c:1737: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1745: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:2603: Test failed: LoadImage() failed with 0. cursoricon.c:2603: Test failed: LoadImage() failed with 0.

1 0

Re: Experimental 64 bit OS X packages ready for testing
by Diego Vicioso 29 Apr '16

29 Apr '16

Can anyone tell me what this means? I tried to run a 64bit app in wine, here is what I got. .wine/drive_c/Program\ Files\ $x86$/Grand\ Theft\ Auto\ V/GTAVLauncher.exe fixme:winediag:start_process Wine Staging 1.9.8 is a testing version containing experimental patches. fixme:winediag:start_process Please mention your exact version when filing bug reports on winehq.org. fixme:ntdll:NtCreateNamedPipeFile Message mode not supported, falling back to byte mode. fixme:ntdll:NtCreateNamedPipeFile Message mode not supported, falling back to byte mode. fixme:ntdll:NtCreateNamedPipeFile Message mode not supported, falling back to byte mode. fixme:ntdll:NtCreateNamedPipeFile Message mode not supported, falling back to byte mode. err:seh:setup_exception stack overflow 1632 bytes in thread 0024 eip 000000007bc42691 esp 0000000000130fa0 stack 0x130000-0x131000-0x230000 Sent from my mac

1 0

Re: [PATCH v2] kernel32/tests: Add more tests for GetConsoleFontInfo
by Sebastian Lackner 29 Apr '16

29 Apr '16

On 29.04.2016 13:29, Hugh McMaster wrote: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > dlls/kernel32/tests/console.c | 76 ++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 71 insertions(+), 5 deletions(-) > > diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c > index 3f627be..756eaba 100644 > --- a/dlls/kernel32/tests/console.c > +++ b/dlls/kernel32/tests/console.c > @@ -2789,7 +2789,7 @@ static void test_GetConsoleFontInfo(HANDLE std_output) > CONSOLE_FONT_INFO *cfi; > BOOL ret; > CONSOLE_SCREEN_BUFFER_INFO csbi; > - COORD orig_font, tmp_font; > + COORD orig_sb_size, tmp_sb_size, orig_font, tmp_font; > > hmod = GetModuleHandleA("kernel32.dll"); > pGetConsoleFontInfo = (void *)GetProcAddress(hmod, "GetConsoleFontInfo"); > @@ -2811,20 +2811,35 @@ static void test_GetConsoleFontInfo(HANDLE std_output) > cfi = HeapAlloc(GetProcessHeap(), 0, memsize); > memset(cfi, 0, memsize); > > + GetConsoleScreenBufferInfo(std_output, &csbi); > + orig_sb_size = csbi.dwSize; > + tmp_sb_size.X = csbi.dwSize.X + 3; > + tmp_sb_size.Y = csbi.dwSize.Y + 5; > + SetConsoleScreenBufferSize(std_output, tmp_sb_size); > + > SetLastError(0xdeadbeef); > ret = pGetConsoleFontInfo(NULL, FALSE, 0, cfi); > ok(!ret, "got %d, expected zero\n", ret); > todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); > + ok(!cfi[0].nFont, "got %d, expected 0\n", cfi[0].nFont); > + ok(!cfi[0].dwFontSize.X, "got %d, expected 0\n", cfi[0].dwFontSize.X); > + ok(!cfi[0].dwFontSize.Y, "got %d, expected 0\n", cfi[0].dwFontSize.Y); Those tests do not add much value. Without initializing cfi before each call, its impossible to tell if GetConsoleFontInfo() nulled the struct or if it wasn't touched at all. However, I'm also not sure if we have to care about the struct content in case of a failure. > > SetLastError(0xdeadbeef); > ret = pGetConsoleFontInfo(GetStdHandle(STD_INPUT_HANDLE), FALSE, 0, cfi); > ok(!ret, "got %d, expected zero\n", ret); > todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); > + ok(!cfi[0].nFont, "got %d, expected 0\n", cfi[0].nFont); > + ok(!cfi[0].dwFontSize.X, "got %d, expected 0\n", cfi[0].dwFontSize.X); > + ok(!cfi[0].dwFontSize.Y, "got %d, expected 0\n", cfi[0].dwFontSize.Y); > > SetLastError(0xdeadbeef); > ret = pGetConsoleFontInfo(std_output, FALSE, 0, cfi); > ok(!ret, "got %d, expected zero\n", ret); > todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); > + ok(!cfi[0].nFont, "got %d, expected 0\n", cfi[0].nFont); > + ok(!cfi[0].dwFontSize.X, "got %d, expected 0\n", cfi[0].dwFontSize.X); > + ok(!cfi[0].dwFontSize.Y, "got %d, expected 0\n", cfi[0].dwFontSize.Y); > > GetConsoleScreenBufferInfo(std_output, &csbi); > win_width = csbi.srWindow.Right - csbi.srWindow.Left + 1; > @@ -2834,22 +2849,73 @@ static void test_GetConsoleFontInfo(HANDLE std_output) > index = cfi[0].nFont; > orig_font = GetConsoleFontSize(std_output, index); > > + memset(cfi, 0, memsize); > SetLastError(0xdeadbeef); > ret = pGetConsoleFontInfo(std_output, FALSE, num_fonts, cfi); > todo_wine ok(ret, "got %d, expected non-zero\n", ret); > todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); > > - ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", cfi[index].dwFontSize.X, win_width); > - ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", cfi[index].dwFontSize.Y, win_height); > + todo_wine ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", > + cfi[index].dwFontSize.X, win_width); > + todo_wine ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", > + cfi[index].dwFontSize.Y, win_height); > > for (i = 0; i < num_fonts; i++) > { > tmp_font = GetConsoleFontSize(std_output, cfi[i].nFont); > tmp_w = (double)orig_font.X / tmp_font.X * win_width; > tmp_h = (double)orig_font.Y / tmp_font.Y * win_height; > - ok(cfi[i].dwFontSize.X == tmp_w, "got %d, expected %d\n", cfi[i].dwFontSize.X, tmp_w); > - ok(cfi[i].dwFontSize.Y == tmp_h, "got %d, expected %d\n", cfi[i].dwFontSize.Y, tmp_h); > + todo_wine ok(cfi[i].dwFontSize.X == tmp_w, "got %d, expected %d\n", cfi[i].dwFontSize.X, tmp_w); > + todo_wine ok(cfi[i].dwFontSize.Y == tmp_h, "got %d, expected %d\n", cfi[i].dwFontSize.Y, tmp_h); As mentioned in one of the previous mails, I still think it would be useful to have a test like ok(cfi[i].nFont == i, "...\n"); to show that the elements are returned in sorted order, and that the font index matches the array index. Otherwise accessing by index (as done in the test above) would not work. Did you defer it to a later patch or was there anything unclear? > + } > + > + memset(cfi, 0, memsize); > + SetLastError(0xdeadbeef); > + ret = pGetConsoleFontInfo(NULL, TRUE, 0, cfi); > + ok(!ret, "got %d, expected zero\n", ret); > + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); > + ok(!cfi[0].nFont, "got %d, expected 0\n", cfi[0].nFont); > + ok(!cfi[0].dwFontSize.X, "got %d, expected 0\n", cfi[0].dwFontSize.X); > + ok(!cfi[0].dwFontSize.Y, "got %d, expected 0\n", cfi[0].dwFontSize.Y); > + > + SetLastError(0xdeadbeef); > + ret = pGetConsoleFontInfo(GetStdHandle(STD_INPUT_HANDLE), TRUE, 0, cfi); > + ok(!ret, "got %d, expected zero\n", ret); > + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); > + ok(!cfi[0].nFont, "got %d, expected 0\n", cfi[0].nFont); > + ok(!cfi[0].dwFontSize.X, "got %d, expected 0\n", cfi[0].dwFontSize.X); > + ok(!cfi[0].dwFontSize.Y, "got %d, expected 0\n", cfi[0].dwFontSize.Y); > + > + SetLastError(0xdeadbeef); > + ret = pGetConsoleFontInfo(std_output, TRUE, 0, cfi); > + ok(!ret, "got %d, expected zero\n", ret); > + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); > + ok(!cfi[0].nFont, "got %d, expected 0\n", cfi[0].nFont); > + ok(!cfi[0].dwFontSize.X, "got %d, expected 0\n", cfi[0].dwFontSize.X); > + ok(!cfi[0].dwFontSize.Y, "got %d, expected 0\n", cfi[0].dwFontSize.Y); > + > + memset(cfi, 0, memsize); > + SetLastError(0xdeadbeef); > + ret = pGetConsoleFontInfo(std_output, TRUE, num_fonts, cfi); > + todo_wine ok(ret, "got %d, expected non-zero\n", ret); > + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); > + > + todo_wine ok(cfi[index].dwFontSize.X == csbi.dwMaximumWindowSize.X, "got %d, expected %d\n", > + cfi[index].dwFontSize.X, csbi.dwMaximumWindowSize.X); > + todo_wine ok(cfi[index].dwFontSize.Y == csbi.dwMaximumWindowSize.Y, "got %d, expected %d\n", > + cfi[index].dwFontSize.Y, csbi.dwMaximumWindowSize.Y); > + > + for (i = 0; i < num_fonts; i++) > + { > + tmp_font = GetConsoleFontSize(std_output, cfi[i].nFont); > + tmp_w = (double)orig_font.X / tmp_font.X * csbi.dwMaximumWindowSize.X; > + tmp_h = (double)orig_font.Y / tmp_font.Y * csbi.dwMaximumWindowSize.Y; > + todo_wine ok(cfi[i].dwFontSize.X == tmp_w, "got %d, expected %d\n", cfi[i].dwFontSize.X, tmp_w); > + todo_wine ok(cfi[i].dwFontSize.Y == tmp_h, "got %d, expected %d\n", cfi[i].dwFontSize.Y, tmp_h); > } > + > + HeapFree(GetProcessHeap(), 0, cfi); > + SetConsoleScreenBufferSize(std_output, orig_sb_size); > } > > START_TEST(console) >

2 2

Re: comctl32: Use SetRect() instead of open coding it.
by Sebastian Lackner 29 Apr '16

29 Apr '16

On 29.04.2016 15:21, Michael Stefaniuc wrote: > - rcDragIcon.left = rcListBox.left - DRAGICON_HOTSPOT_X; > - rcDragIcon.top = rcItem.top - DRAGICON_HOTSPOT_Y; > - rcDragIcon.right = rcListBox.left; > - rcDragIcon.bottom = rcDragIcon.top + DRAGICON_HEIGHT; > + SetRect(&rcDragIcon, rcListBox.left - DRAGICON_HOTSPOT_X, rcItem.top - DRAGICON_HOTSPOT_Y, > + rcListBox.left, rcDragIcon.top + DRAGICON_HEIGHT); This won't work as expected. Haven't checked if there are more similar cases.

2 2

Re: [PATCH 1/2] ntdll: Add NtQueryMutant
by Sebastian Lackner 29 Apr '16

29 Apr '16

Hi Daniel, thanks for working on this. I have a couple of remarks, see below. On 29.04.2016 03:53, Daniel Lehman wrote: > Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> > --- > dlls/ntdll/sync.c | 38 +++++++++++++---- > dlls/ntdll/tests/om.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++ > server/mutex.c | 16 ++++++++ > server/protocol.def | 10 +++++ > 4 files changed, 167 insertions(+), 9 deletions(-) > > diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c > index e87e672..576593f 100644 > --- a/dlls/ntdll/sync.c > +++ b/dlls/ntdll/sync.c > @@ -520,15 +520,35 @@ NTSTATUS WINAPI NtReleaseMutant( IN HANDLE handle, OUT PLONG prev_count OPTIONAL > * NtQueryMutant [NTDLL.@] > * ZwQueryMutant [NTDLL.@] > */ > -NTSTATUS WINAPI NtQueryMutant(IN HANDLE handle, > - IN MUTANT_INFORMATION_CLASS MutantInformationClass, > - OUT PVOID MutantInformation, > - IN ULONG MutantInformationLength, > - OUT PULONG ResultLength OPTIONAL ) > -{ > - FIXME("(%p %u %p %u %p): stub!\n", > - handle, MutantInformationClass, MutantInformation, MutantInformationLength, ResultLength); Please convert the FIXME to a TRACE instead of removing it. > - return STATUS_NOT_IMPLEMENTED; > +NTSTATUS WINAPI NtQueryMutant( HANDLE handle, MUTANT_INFORMATION_CLASS class, > + void *info, ULONG len, ULONG *ret_len ) > +{ > + NTSTATUS ret; > + MUTANT_BASIC_INFORMATION *out = info; > + > + if (class != MutantBasicInformation) > + { > + FIXME("(%p, %d, %d) Unknown class\n", > + handle, class, len); > + return STATUS_INVALID_INFO_CLASS; > + } > + > + if (len != sizeof(MUTANT_BASIC_INFORMATION)) return STATUS_INFO_LENGTH_MISMATCH; > + > + SERVER_START_REQ( query_mutex ) > + { > + req->handle = wine_server_obj_handle( handle ); > + if (!(ret = wine_server_call( req ))) > + { > + out->CurrentCount = 1 - reply->count; > + out->OwnedByCaller = reply->owned; > + out->AbandonedState = reply->abandoned; > + if (ret_len) *ret_len = sizeof(MUTANT_BASIC_INFORMATION); > + } > + } > + SERVER_END_REQ; > + > + return ret; > } > > /* > diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c > index c05f31d..ee850d3 100644 > --- a/dlls/ntdll/tests/om.c > +++ b/dlls/ntdll/tests/om.c > @@ -43,6 +43,8 @@ static NTSTATUS (WINAPI *pNtCreateMailslotFile)( PHANDLE, ACCESS_MASK, POBJECT_A > ULONG, ULONG, ULONG, PLARGE_INTEGER ); > static NTSTATUS (WINAPI *pNtCreateMutant)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, BOOLEAN ); > static NTSTATUS (WINAPI *pNtOpenMutant) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES ); > +static NTSTATUS (WINAPI *pNtQueryMutant) ( HANDLE, MUTANT_INFORMATION_CLASS, PVOID, ULONG, PULONG ); > +static NTSTATUS (WINAPI *pNtReleaseMutant)( HANDLE, PLONG ); > static NTSTATUS (WINAPI *pNtCreateSemaphore)( PHANDLE, ACCESS_MASK,const POBJECT_ATTRIBUTES,LONG,LONG ); > static NTSTATUS (WINAPI *pNtOpenSemaphore)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES ); > static NTSTATUS (WINAPI *pNtCreateTimer) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, TIMER_TYPE ); > @@ -1865,6 +1867,113 @@ static void test_null_device(void) > CloseHandle(ov.hEvent); > } > > +static DWORD WINAPI mutant_thread( void *arg ) > +{ > + MUTANT_BASIC_INFORMATION info; > + NTSTATUS status; > + HANDLE mutant; > + > + mutant = arg; > + status = WaitForSingleObject( mutant, 1000 ); > + ok( status == STATUS_SUCCESS, "WaitForSingleObject failed %08x\n", status ); WaitForSingleObject does not return STATUS_* values. This error also appears a couple more times below. > + > + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); > + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); > + ok( info.CurrentCount == 0, "NtQueryMutant failed, expected 0, got %d\n", info.CurrentCount ); > + ok( info.OwnedByCaller == TRUE, "NtQueryMutant failed, expected TRUE, got %d\n", info.OwnedByCaller ); > + ok( info.AbandonedState == FALSE, "NtQueryMutant failed, expected FALSE, got %d\n", info.AbandonedState ); Its a matter of taste, but I am not sure if it makes sense to duplicate the "NtQueryMutant failed". Better print the variable which was tested, for example "expected CurrentCount == 0, got %d\n", and so on. > + /* abandon mutant */ > + > + return 0; > +} > + > +static void test_mutant(void) > +{ > + static const WCHAR name[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s', > + '\\','t','e','s','t','_','m','u','t','a','n','t',0}; > + MUTANT_BASIC_INFORMATION info; > + OBJECT_ATTRIBUTES attr; > + UNICODE_STRING str; > + NTSTATUS status; > + HANDLE mutant; > + HANDLE thread; > + ULONG len; > + LONG prev; > + > + pRtlInitUnicodeString(&str, name); > + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); > + status = pNtCreateMutant(&mutant, GENERIC_ALL, &attr, TRUE); > + ok( status == STATUS_SUCCESS, "Failed to create Mutant(%08x)\n", status ); > + > + /* bogus */ > + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, 0, NULL); > + ok( status == STATUS_INFO_LENGTH_MISMATCH, > + "Failed to NtQueryMutant, expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); > + status = pNtQueryMutant(mutant, 0x42, &info, sizeof(info), NULL); > + ok( status == STATUS_INVALID_INFO_CLASS, > + "Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); > + status = pNtQueryMutant((HANDLE)0xdeadbeef, MutantBasicInformation, &info, sizeof(info), NULL); > + ok( status == STATUS_INVALID_HANDLE, > + "Failed to NtQueryMutant, expected STATUS_INVALID_HANDLE, got %08x\n", status ); Not sure if you have seen it, but your patch causes new test failures, see: http://newtestbot.winehq.org/JobDetails.pl?Key=22713 > + > + /* new */ > + len = -1; > + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), &len); > + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); > + ok( info.CurrentCount == 0, "NtQueryMutant failed, expected 0, got %d\n", info.CurrentCount ); > + ok( info.OwnedByCaller == TRUE, "NtQueryMutant failed, expected TRUE, got %d\n", info.OwnedByCaller ); > + ok( info.AbandonedState == FALSE, "NtQueryMutant failed, expected FALSE, got %d\n", info.AbandonedState ); > + ok( len == sizeof(info), "NtQueryMutant failed, expected %u, got %u\n", (DWORD)sizeof(info), len ); Its better to avoid printing sizeof() values, only print the "len" value here. > + There is a whitespace issue in the line above. > + status = WaitForSingleObject( mutant, 1000 ); > + ok( status == STATUS_SUCCESS, "WaitForSingleObject failed %08x\n", status ); > + > + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); > + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); > + ok( info.CurrentCount == -1, "NtQueryMutant failed, expected -1, got %d\n", info.CurrentCount ); > + ok( info.OwnedByCaller == TRUE, "NtQueryMutant failed, expected TRUE, got %d\n", info.OwnedByCaller ); > + ok( info.AbandonedState == FALSE, "NtQueryMutant failed, expected FALSE, got %d\n", info.AbandonedState ); > + > + prev = 0xdeadbeef; > + status = pNtReleaseMutant(mutant, &prev); > + ok( status == STATUS_SUCCESS, "NtQueryRelease failed %08x\n", status ); > + todo_wine ok( prev == -1, "NtQueryRelease failed, expected -1, got %d\n", prev ); > + > + prev = 0xdeadbeef; > + status = pNtReleaseMutant(mutant, &prev); > + ok( status == STATUS_SUCCESS, "NtQueryRelease failed %08x\n", status ); > + todo_wine ok( prev == 0, "NtQueryRelease failed, expected 0, got %d\n", prev ); > + > + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); > + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); > + ok( info.CurrentCount == 1, "NtQueryMutant failed, expected 1, got %d\n", info.CurrentCount ); > + ok( info.OwnedByCaller == FALSE, "NtQueryMutant failed, expected FALSE, got %d\n", info.OwnedByCaller ); > + ok( info.AbandonedState == FALSE, "NtQueryMutant failed, expected FALSE, got %d\n", info.AbandonedState ); > + > + /* abandoned */ > + thread = CreateThread( NULL, 0, mutant_thread, mutant, 0, NULL ); > + status = WaitForSingleObject( thread, 1000 ); > + ok( status == 0, "WaitForSingleObject failed %08x\n", status ); > + NtClose( thread ); > + > + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); > + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); > + ok( info.CurrentCount == 1, "NtQueryMutant failed, expected 0, got %d\n", info.CurrentCount ); > + ok( info.OwnedByCaller == FALSE, "NtQueryMutant failed, expected FALSE, got %d\n", info.OwnedByCaller ); > + ok( info.AbandonedState == TRUE, "NtQueryMutant failed, expected TRUE, got %d\n", info.AbandonedState ); > + > + status = WaitForSingleObject( mutant, 1000 ); > + ok( status == STATUS_ABANDONED_WAIT_0, "WaitForSingleObject failed %08x\n", status ); > + > + status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); > + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); > + ok( info.CurrentCount == 0, "NtQueryMutant failed, expected 0, got %d\n", info.CurrentCount ); > + ok( info.OwnedByCaller == TRUE, "NtQueryMutant failed, expected TRUE, got %d\n", info.OwnedByCaller ); > + ok( info.AbandonedState == FALSE, "NtQueryMutant failed, expected FALSE, got %d\n", info.AbandonedState ); > + > + NtClose( mutant ); > +} > + > START_TEST(om) > { > HMODULE hntdll = GetModuleHandleA("ntdll.dll"); > @@ -1892,6 +2001,8 @@ START_TEST(om) > pNtQueryEvent = (void *)GetProcAddress(hntdll, "NtQueryEvent"); > pNtPulseEvent = (void *)GetProcAddress(hntdll, "NtPulseEvent"); > pNtOpenMutant = (void *)GetProcAddress(hntdll, "NtOpenMutant"); > + pNtQueryMutant = (void *)GetProcAddress(hntdll, "NtQueryMutant"); > + pNtReleaseMutant = (void *)GetProcAddress(hntdll, "NtReleaseMutant"); > pNtOpenFile = (void *)GetProcAddress(hntdll, "NtOpenFile"); > pNtClose = (void *)GetProcAddress(hntdll, "NtClose"); > pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); > @@ -1925,6 +2036,7 @@ START_TEST(om) > test_query_object(); > test_type_mismatch(); > test_event(); > + test_mutant(); > test_keyed_events(); > test_null_device(); > } > diff --git a/server/mutex.c b/server/mutex.c > index 3693095..b183934 100644 > --- a/server/mutex.c > +++ b/server/mutex.c > @@ -251,3 +251,19 @@ DECL_HANDLER(release_mutex) > release_object( mutex ); > } > } > + > +/* return details about the event */ Copy-paste mistake? > +DECL_HANDLER(query_mutex) > +{ > + struct mutex *mutex; > + > + if ((mutex = (struct mutex *)get_handle_obj( current->process, req->handle, > + MUTANT_QUERY_STATE, &mutex_ops ))) > + { > + reply->count = mutex->count; > + reply->owned = mutex->owner == current; I usually prefer brackets around such comparisons, but not sure if its strictly required. > + reply->abandoned = mutex->abandoned; > + > + release_object( mutex ); > + } > +} > diff --git a/server/protocol.def b/server/protocol.def > index a5a45eb..3359b77 100644 > --- a/server/protocol.def > +++ b/server/protocol.def > @@ -1093,6 +1093,16 @@ enum event_op { PULSE_EVENT, SET_EVENT, RESET_EVENT }; > @END > > > +/* Query a mutex */ > +@REQ(query_mutex) > + obj_handle_t handle; /* handle to event */ > +@REPLY > + unsigned int count; /* current count of mutex */ > + int owned; /* true if owned by current thread */ > + int abandoned; /* true if abandoned */ > +@END > + > + > /* Create a semaphore */ > @REQ(create_semaphore) > unsigned int access; /* wanted access rights */ >

1 0

Re: user32: Implement SetCoalescableTimer and add basic tests.
by Marvin 29 Apr '16

29 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22731 Your paranoid android. === w1064 (32 bit msg) === msg.c:6484: Test failed: Update region shouldn't be empty msg.c:6718: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6720: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6490: Test failed: Regions are different msg.c:6490: Test failed: Regions are different msg.c:6490: Test failed: Regions are different === w864 (64 bit msg) === msg.c:6484: Test failed: Update region shouldn't be empty msg.c:6718: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6720: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6490: Test failed: Regions are different msg.c:6490: Test failed: Regions are different msg.c:6490: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:6484: Test failed: Update region shouldn't be empty msg.c:6718: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6720: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6490: Test failed: Regions are different msg.c:6490: Test failed: Regions are different msg.c:6490: Test failed: Regions are different

2 1

Re: [PATCH v2] kernel32/tests: Add more tests for GetConsoleFontInfo
by Marvin 29 Apr '16

29 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22732 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 3589215353 console.c:1445: Test failed: [15] Expected output count to be 0, got 3589215353 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3589215353 console.c:1689: Test failed: [13] Expected output count to be 0, got 3589215353 console.c:1689: Test failed: [15] Expected output count to be 0, got 3589215353 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3589215353 === w864 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 216706042 console.c:1445: Test failed: [15] Expected output count to be 0, got 216706042 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 216706042 console.c:1689: Test failed: [13] Expected output count to be 0, got 216706042 console.c:1689: Test failed: [15] Expected output count to be 0, got 216706042 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 216706042 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 1066250053 console.c:1445: Test failed: [15] Expected output count to be 0, got 1066250053 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 1066250053 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 1066250053 console.c:1689: Test failed: [15] Expected output count to be 0, got 1066250053 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 1066250053 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w864 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

2 1

Re: user32/tests: Add additional test for window station name.
by Sebastian Lackner 29 Apr '16

29 Apr '16

On 25.04.2016 23:25, Sebastian Lackner wrote: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > dlls/user32/tests/winstation.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c > index e49420b..94be4c9 100644 > --- a/dlls/user32/tests/winstation.c > +++ b/dlls/user32/tests/winstation.c > @@ -114,6 +114,8 @@ static void test_handles(void) > DWORD id, flags, le; > ATOM atom; > char buffer[20]; > + DWORD size; > + BOOL ret; > > /* win stations */ > > @@ -215,6 +217,12 @@ static void test_handles(void) > w2 = CreateWindowStationA( "", 0, WINSTA_ALL_ACCESS, NULL ); > ok( w2 != 0, "create station failed err %u\n", GetLastError() ); > > + memset( buffer, 0, sizeof(buffer) ); > + ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size ); > + ok( ret, "GetUserObjectInformationA failed with error %u\n", GetLastError() ); > + todo_wine ok( !memcmp(buffer, "Service-0x0-", 12), "unexpected window station name '%s'\n", buffer ); > + todo_wine ok( buffer[strlen(buffer) - 1] == '$', "unexpected window station name '%s'\n", buffer ); > + > SetLastError( 0xdeadbeef ); > w3 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS ); > todo_wine > Before I resend, may I ask why this patch is pending? If its because of the hardcoded "0x0", I can change that of course. The main point is to show that window stations without a name get assigned one by the operating system. Applications depend on this when they "manually" implement window station inheritance (query name and later pass it to CreateProcess). Regards, Sebastian

2 1

Re: kernel32: Improve the stub for GetThreadPreferredUILanguages.
by Marvin 29 Apr '16

29 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22718 Your paranoid android. === w1064 (32 bit locale) === locale.c:2367: Test failed: LCMapStringEx should fail with bad locale name locale.c:2368: Test failed: unexpected error code -559038737 locale.c:2459: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4177: Test failed: IsValidLocaleName should have failed locale.c:4179: Test failed: IsValidLocaleName should have failed locale.c:4544: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4546: Test failed: For id 7, Expected IVC, got '' === w1064 (64 bit locale) === locale.c:2367: Test failed: LCMapStringEx should fail with bad locale name locale.c:2368: Test failed: unexpected error code -559038737 locale.c:2459: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4177: Test failed: IsValidLocaleName should have failed locale.c:4179: Test failed: IsValidLocaleName should have failed locale.c:4544: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4546: Test failed: For id 7, Expected IVC, got ''

2 1

Re: [PATCH 2/2] ntdll: Fix prev_count from NtReleaseMutant
by Marvin 29 Apr '16

29 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22715 Your paranoid android. === wvistau64 (32 bit om) === om.c:1913: Test failed: Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got c0000002 === w2008s64 (32 bit om) === om.c:1913: Test failed: Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got c0000002

1 0

Re: [PATCH 1/2] ntdll: Add NtQueryMutant
by Marvin 29 Apr '16

29 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22714 Your paranoid android. === wvistau64 (32 bit om) === om.c:1913: Test failed: Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got c0000002 === w2008s64 (32 bit om) === om.c:1913: Test failed: Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got c0000002

1 0

Re: [PATCH 1/2] ntdll: Add NtQueryMutant
by Marvin 29 Apr '16

29 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22713 Your paranoid android. === wvistau64 (32 bit om) === om.c:1913: Test failed: Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got c0000002 === w2008s64 (32 bit om) === om.c:1913: Test failed: Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got c0000002

1 0

Re: [PATCH 3/4] d3drm: Implement IDirect3DRM*_CreateTexture.
by Sebastian Lackner 28 Apr '16

28 Apr '16

On 28.04.2016 21:17, Aaryaman Vasishta wrote: > if (FAILED(hr = d3drm_texture_create(&object))) > + { > + d3drm_texture_destroy(object); > return hr; > + } I have not reviewed the whole series, but it looks like you are calling d3drm_texture_destroy on an uninitialized variable here.

2 1

Re: [PATCH 2/4] d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage.
by Sebastian Lackner 28 Apr '16

28 Apr '16

On 28.04.2016 21:17, Aaryaman Vasishta wrote: > + IDirect3DRM_AddRef(texture->d3drm); > + > + if (texture->image) > + return D3DRMERR_BADOBJECT; Doesn't this leak a reference in case of an error? ->initialized is not set to TRUE yet.

2 1

Re: [PATCH 1/2] enhmfdrv: Always set ExtTextOut bounding rect if we're not inside path bracket
by Huw Davies 28 Apr '16

28 Apr '16

On Tue, Apr 26, 2016 at 02:19:27PM +0200, Piotr Caban wrote: > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > dlls/gdi32/enhmfdrv/dc.c | 6 ++++++ > dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + > dlls/gdi32/enhmfdrv/graphics.c | 4 +++- > dlls/gdi32/enhmfdrv/init.c | 1 + > dlls/gdi32/tests/metafile.c | 11 +++++++++++ > 5 files changed, 22 insertions(+), 1 deletion(-) I think we need a better understanding of paths on metafiles. There have been a number of patches which mainly hack ExtTextOut when it's clear that the issues extend beyond that single record. For example, I've just noticed that a Rectangle within a path doesn't update the emf's bounds. This unfortunately was not spotted by test_emf_GetPath() because for some reason compare_emf_bits() doesn't check them. Huw.

2 1

Re: kernel32/tests: Add more tests for GetConsoleFontInfo
by Marvin 28 Apr '16

28 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22682 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 3696961328 console.c:1445: Test failed: [15] Expected output count to be 0, got 3696961328 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3696961328 console.c:1689: Test failed: [13] Expected output count to be 0, got 3696961328 console.c:1689: Test failed: [15] Expected output count to be 0, got 3696961328 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3696961328 === w864 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 4078116005 console.c:1445: Test failed: [15] Expected output count to be 0, got 4078116005 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 4078116005 console.c:1689: Test failed: [13] Expected output count to be 0, got 4078116005 console.c:1689: Test failed: [15] Expected output count to be 0, got 4078116005 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 4078116005 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 3654641613 console.c:1445: Test failed: [15] Expected output count to be 0, got 3654641613 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3654641613 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 3654641613 console.c:1689: Test failed: [15] Expected output count to be 0, got 3654641613 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3654641613 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w864 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

1 0

Re: kernel32/tests: Add more tests for GetConsoleFontInfo
by Sebastian Lackner 28 Apr '16

28 Apr '16

On 28.04.2016 15:27, Hugh McMaster wrote: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > dlls/kernel32/tests/console.c | 66 ++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 65 insertions(+), 1 deletion(-) > They don't pass here: console.c:2858: Test failed: got 0, expected 80 console.c:2859: Test failed: got 0, expected 25 console.c:2866: Test failed: got 0, expected 80 console.c:2867: Test failed: got 0, expected 25 console.c:2901: Test failed: got 0, expected 83 console.c:2903: Test failed: got 0, expected 30 console.c:2911: Test failed: got 0, expected 83 console.c:2912: Test failed: got 0, expected 30

1 0

Re: server: Fix detection of duplicate console history lines. (v2)
by Alexandre Julliard 28 Apr '16

28 Apr '16

Sebastian Lackner <sebastian(a)fds-team.de> writes: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > Changes in v2: > * We can't really use memcmp because it could allow exploits with special input, > like "abc\0def", where it would probably compare past the end of the string. Note that you don't need special input, any comparison with a shorter string can potentially overrun. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: jscript: Fix handling of numbers starting with decimal separator
by Marvin 28 Apr '16

28 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22675 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

1 0

Re: kernel32: add GetVolumeInformationByHandleW stub (try 3)
by Nikolay Sivov 28 Apr '16

28 Apr '16

I didn't try myself, but I think we have everything to implement it, like this: GetFileInformationByHandleEx with FileNameInfo -> GetVolumePathNameW -> GetVolumeInformationW. If this works for affected application I think it's better to implement it instead of getting in a stub, to find out later that it's not enough.

2 2

Re: [PATCH 1/2] mciqtz: Dispatch messages while waiting on command completion.
by Alexandre Julliard 28 Apr '16

28 Apr '16

Andrew Eikum <aeikum(a)codeweavers.com> writes: > Without this, we can hit a deadlock if the task thread tries to call a > SendMessage on a window owned by the calling thread. > > Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> > --- > dlls/mciqtz32/mciqtz.c | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) This breaks the tests here: ../../../tools/runtest -q -P wine -T ../../.. -M winmm.dll -p winmm_test.exe.so mci && touch mci.ok mci.c:1362: Test failed: Expect message 0001 from open alias notify mci.c:1375: Test failed: Expect message 0002 from play (superseded) mci.c:1376: Test failed: Expect message 0001 from status mci.c:1391: Test failed: Expect message 0004 from play (aborted by close) Makefile:226: recipe for target 'mci.ok' failed make: *** [mci.ok] Error 4 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: kernel32: add GetVolumeInformationByHandleW stub (try 3)
by Sebastian Lackner 28 Apr '16

28 Apr '16

On 27.04.2016 08:58, Austin English wrote: > I used DWORD * / WCHAR * to avoid adding LP* obfuscations, which is > usually discouraged. > > Try 3: fix formatting > > -- -Austin > > > 0001-kernel32-add-GetVolumeInformationByHandleW-stub-try-.patch > > > From e96e61749556454fb97c382f5f2452d1a825c053 Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Mon, 4 Apr 2016 13:22:44 -0500 > Subject: [PATCH] kernel32: add GetVolumeInformationByHandleW stub (try 3) > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/kernel32/kernel32.spec | 2 +- > dlls/kernel32/volume.c | 12 ++++++++++++ > include/winbase.h | 1 + > 3 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec > index 71dbe4d..2ad9ad4 100644 > --- a/dlls/kernel32/kernel32.spec > +++ b/dlls/kernel32/kernel32.spec > @@ -875,7 +875,7 @@ > @ stdcall GetVersionExA(ptr) > @ stdcall GetVersionExW(ptr) > @ stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long) > -# @ stub GetVolumeInformationByHandleW > +@ stdcall GetVolumeInformationByHandleW(ptr wstr long ptr ptr ptr wstr long) HANDLEs should be marked as "long" in the spec file. > @ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) > @ stdcall GetVolumeNameForVolumeMountPointA(str ptr long) > @ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) > diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c > index 4f01c99..81905e8 100644 > --- a/dlls/kernel32/volume.c > +++ b/dlls/kernel32/volume.c > @@ -2309,3 +2309,15 @@ BOOL WINAPI SetVolumeMountPointW(LPCWSTR path, LPCWSTR volume) > SetLastError(ERROR_CALL_NOT_IMPLEMENTED); > return FALSE; > } > + > +/*********************************************************************** > + * GetVolumeInformationByHandleW (KERNEL32.@) > + */ > +BOOL WINAPI GetVolumeInformationByHandleW(HANDLE handle, WCHAR *volnamebuf, DWORD volnamesize, DWORD *volserial, > + DWORD *maxlength, DWORD *flags, WCHAR *fsnamebuf, DWORD fsnamesize) > +{ > + FIXME("%p %s %d %p %p %p %s %d\n", handle, debugstr_w(volnamebuf), volnamesize, volserial, maxlength, flags, > + debugstr_w(fsnamebuf), fsnamesize); According to MSDN, those WCHAR arguments should be output parameters. It doesn't really make sense to trace them with debugstr_w. > + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); > + return FALSE; > +} > diff --git a/include/winbase.h b/include/winbase.h > index c5332c0..fac6c29 100644 > --- a/include/winbase.h > +++ b/include/winbase.h > @@ -2167,6 +2167,7 @@ WINBASEAPI BOOL WINAPI GetVersionExW(OSVERSIONINFOW*); > WINBASEAPI BOOL WINAPI GetVolumeInformationA(LPCSTR,LPSTR,DWORD,LPDWORD,LPDWORD,LPDWORD,LPSTR,DWORD); > WINBASEAPI BOOL WINAPI GetVolumeInformationW(LPCWSTR,LPWSTR,DWORD,LPDWORD,LPDWORD,LPDWORD,LPWSTR,DWORD); > #define GetVolumeInformation WINELIB_NAME_AW(GetVolumeInformation) > +WINBASEAPI BOOL WINAPI GetVolumeInformationByHandleW(HANDLE,WCHAR *,DWORD,DWORD *,DWORD *,DWORD *,WCHAR *,DWORD); > WINBASEAPI BOOL WINAPI GetVolumeNameForVolumeMountPointA(LPCSTR,LPSTR,DWORD); > WINBASEAPI BOOL WINAPI GetVolumeNameForVolumeMountPointW(LPCWSTR,LPWSTR,DWORD); > #define GetVolumeNameForVolumeMountPoint WINELIB_NAME_AW(GetVolumeNameForVolumeMountPoint) > -- 2.8.0.rc3 > > >

1 0

Re: [5/5] wininet/tests: Add tests for asynchronous InternetReadFile. (v4)
by Marvin 28 Apr '16

28 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22660 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w1064 (64 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

1 0

Re: [3/5] wininet: Send INTERNET_STATUS_RESPONSE_RECEIVED notification in async handler. (v4)
by Marvin 28 Apr '16

28 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22659 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w7pro64 (64 bit http) === http.c:5979: Test failed: HttpQueryInfoA failed 6 === w1064 (64 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

1 0

Re: [2/5] wininet/tests: Add tests for asynchronous InternetReadFileEx. (v4)
by Marvin 28 Apr '16

28 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22658 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w1064 (64 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

1 0

Re: [v2 PATCH] d3dx10: Implement D3DX10UnsetAllDeviceObjects()
by Józef Kucia 27 Apr '16

27 Apr '16

On Wed, Apr 27, 2016 at 1:40 PM, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > + /* Verify the initial state after device creation. */ I think it's unnecessary to duplicate tests for the device initial state in d3dx10 tests. > + /* Verify the behavior of set state methods. */ This part is a test for ID3D10Device_OMSetBlendState(). It isn't necessary as well. > + /* Verify the set state. */ This part isn't strictly necessary but it can be argued that it makes sense to verify that the state was properly set before calling D3DX10UnsetAllDeviceObjects().

1 0

Re: [PATCH 2/2] winmm/tests: Add tests showing window message processing while opening a video.
by Marvin 27 Apr '16

27 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22649 Your paranoid android. === w7u (32 bit mci) === mci.c:1122: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) === w1064 (32 bit mci) === mci: unhandled exception c0000005 at 7698A3E7 === w864 (64 bit mci) === mci.c:1122: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) === w1064 (64 bit mci) === mci.c:1122: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close)

1 0

Re: kernel32/tests: Add initial tests for GetConsoleFontInfo (v3)
by Sebastian Lackner 27 Apr '16

27 Apr '16

I am aware that this patch is already committed, but since you are probably still working on the follow-up patches, here some remarks: On 26.04.2016 14:06, Hugh McMaster wrote: > + GetCurrentConsoleFont(std_output, FALSE, &cfi[0]); > + index = cfi[0].nFont; > + orig_font = GetConsoleFontSize(std_output, index); > + You might want to do a memset here. Currently some of the tests pass, although Wine has no implementation yet. > + SetLastError(0xdeadbeef); > + ret = pGetConsoleFontInfo(std_output, FALSE, num_fonts, cfi); > + todo_wine ok(ret, "got %d, expected non-zero\n", ret); > + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); > + > + ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", cfi[index].dwFontSize.X, win_width); > + ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", cfi[index].dwFontSize.Y, win_height); Could you add an additional test that (cfi[i].nFont == i) holds? If GetConsoleFontInfo would return elements in arbitrary order, the code above would not work. > + > + for (i = 0; i < num_fonts; i++) > + { > + tmp_font = GetConsoleFontSize(std_output, cfi[i].nFont); > + tmp_w = (double)orig_font.X / tmp_font.X * win_width; > + tmp_h = (double)orig_font.Y / tmp_font.Y * win_height; > + ok(cfi[i].dwFontSize.X == tmp_w, "got %d, expected %d\n", cfi[i].dwFontSize.X, tmp_w); > + ok(cfi[i].dwFontSize.Y == tmp_h, "got %d, expected %d\n", cfi[i].dwFontSize.Y, tmp_h); > + } It wouldn't hurt to HeapFree() cfi here. > +} > + > START_TEST(console) > { > static const char font_name[] = "Lucida Console"; > @@ -2925,4 +2998,5 @@ START_TEST(console) > test_GetCurrentConsoleFont(hConOut); > test_GetConsoleFontSize(hConOut); > test_GetLargestConsoleWindowSize(hConOut); > + test_GetConsoleFontInfo(hConOut); > } >

2 2

Re: [PATCH] msvcrt: Handle overflow in calloc()
by Marvin 27 Apr '16

27 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22628 Your paranoid android. === wxppro (32 bit heap) === heap.c:478: Test failed: got errno 0 === w2003std (32 bit heap) === heap.c:478: Test failed: got errno 0

1 0

Re: [PATCH 5/5] qedit: Implement IAMTimelineObj_GetTimelineNoRef and add tests.
by Nikolay Sivov 27 Apr '16

27 Apr '16

On 26.04.2016 6:10, Alex Henrie wrote: > static HRESULT WINAPI TimelineObj_GetTimelineNoRef(IAMTimelineObj *iface, IAMTimeline **timeline) > { > + /* MSDN says that this function is "not supported" */ > TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); > - FIXME("(%p)->(%p): not implemented!\n", This, timeline); > - return E_NOTIMPL; > + TRACE("(%p)->(%p)\n", This, timeline); > + if (!timeline) return E_POINTER; > + return E_NOINTERFACE; > } This looks like a call to QI, according to your tests.

3 6

Re: kernel32: add GetVolumeInformationByHandleW stub (try 2)
by Austin English 27 Apr '16

27 Apr '16

On Wed, Apr 6, 2016 at 5:34 PM, Austin English <austinenglish(a)gmail.com> wrote: > -- > -Austin Could I get some feedback on this patch please? -- -Austin

2 2

Re: [1/5] wininet: Fix async check in HTTPREQ_ReadFileEx. (resend)
by Sebastian Lackner 27 Apr '16

27 Apr '16

On 26.04.2016 23:37, Sebastian Lackner wrote: > From: Michael Müller <michael(a)fds-team.de> > > Signed-off-by: Michael Müller <michael(a)fds-team.de> > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > dlls/wininet/http.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) I do not see anything obviously wrong with this patch, but it seems to cause at least one regression (maybe unhandled IRF_SYNC?). I would vote for defering patch 1-4 until the issue has been investigated. Patch 5 can be applied independently and only affects the tests, so it should be fine.

1 0

The future of the native theming support
by Ivan Akulinchev 27 Apr '16

27 Apr '16

So my GSoC proposal wasn't accepted this year. Probably it was my mistake by applying it too late, but this mail is not about this. Since a big research was already done, it would be fine to implement this feature anyway. The problem is that I still don't know what such people as Alexandre Julliard think about it. I got some positive feedback from normal users and even some Wine developers. However they don't make decisions about the Wine future and I don't want to spend my time if this feature will never get into upstream. As far as I know there already were some attempts to do something in this direction. But interesting patches I found in wine-patches were left without any response and Wine still looks like a monster from 90s. At the same time I see a lot of patches affecting the DirectX API. Is it the official position of the Wine maintainers to keep Wine as an OpenGL wrapper? Of course there are a lot of users who just want to play their Windows games on the Unix-like systems, but the need of working with normal desktop applications is still very high. There also were some questions about integrating new themes to the existing system. If it matters, I found a way to make it transparently for the end users. A new "GTK+" or even "Mac" theme can live together with old MSSTYLES themes without need of switching any "theme drivers" as it was said in my GSoC proposal. Regards, Ivan

4 8

Re: [PATCH 4/7] winex11.drv: elimininate the unnecessary XDND critical section
by Alexandre Julliard 27 Apr '16

27 Apr '16

Damjan Jovanovic <damjan.jov(a)gmail.com> writes: > Everything happens on the UI thread, so there's no point in > doing any synchronization. What UI thread? Aren't the messages handled by the standard per-thread message loop? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [5/5] wininet/tests: Add more tests for INTERNET_INVALID_PORT_NUMBER. (resend)
by Marvin 26 Apr '16

26 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22619 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w1064 (64 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

1 0

Re: [4/5] wininet/tests: Add tests for asynchronous InternetReadFile. (v3)
by Marvin 26 Apr '16

26 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22618 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w1064 (64 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

1 0

Re: [2/5] wininet/tests: Add tests for asynchronous InternetReadFileEx. (v3)
by Marvin 26 Apr '16

26 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22617 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w1064 (64 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

1 0

Re: [2/6] wininet/tests: Add tests for asynchronous InternetReadFileEx.
by Jacek Caban 26 Apr '16

26 Apr '16

Hi Sebastian, On 04/25/16 21:41, Sebastian Lackner wrote: > + memset( &ib, 0, sizeof(ib) ); > + memset( buffer, 0, sizeof(buffer) ); > + ib.dwStructSize = sizeof(ib); > + for (count = 0; count < sizeof(buffer); count += ib.dwBufferLength) > + { > + ib.lpvBuffer = buffer + count; > + ib.dwBufferLength = sizeof(buffer) - count; > + > + SET_OPTIONAL( INTERNET_STATUS_RECEIVING_RESPONSE ); > + SET_OPTIONAL( INTERNET_STATUS_RESPONSE_RECEIVED ); > + > + ret = InternetReadFileExA( req, &ib, 0, 0xdeadbeef ); > + if (!ret) > + { > + ok( GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError() ); > + SET_EXPECT( INTERNET_STATUS_REQUEST_COMPLETE ); > + SetEvent( conn_wait_event ); > + WaitForSingleObject( hCompleteEvent, INFINITE ); > + ok( req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error ); > + CHECK_NOTIFIED( INTERNET_STATUS_REQUEST_COMPLETE ); > + } It's a nice way to force async read, but when you add tests with predictable reads it would be nice to take more advantage of that. What do you think about: - call InternetReadFileEx and check that it's done sync - call InternetReadFileEx and check that it's done async - set conn_wait_event, wait completion and make sure we read all remaining data - call InternetReadFileEx and make sure it synchronously hits the end of data Thanks, Jacek

2 5

Re: [6/6] wininet: Handle INTERNET_INVALID_PORT_NUMBER in HttpOpenRequest.
by Jacek Caban 26 Apr '16

26 Apr '16

Hi Sebastian, On 04/25/16 21:46, Sebastian Lackner wrote: > - request->server = get_server(session->hostName, session->hostPort, (dwFlags & INTERNET_FLAG_SECURE) != 0, TRUE); > + port = session->hostPort; > + if (port == INTERNET_INVALID_PORT_NUMBER) > + { > + port = (session->hdr.dwFlags & INTERNET_FLAG_SECURE) ? > + INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; > + } > + > + request->server = get_server(session->hostName, port, (dwFlags & INTERNET_FLAG_SECURE) != 0, TRUE); Note that get_server already has code to deal with INTERNET_INVALID_PORT_NUMBER, so it would be enough to handle https case there. However, given that all other callers have valid port numbers, I agree that it would be cleaner to do that in HTTP_HttpOpenRequestW instead. Given that your moving the logic around, please remove no longer needed code there. Thanks, Jacek

2 2

Re: [PATCH 2/5] qedit: Stub out AMTimelineObj.
by Andrew Eikum 26 Apr '16

26 Apr '16

On Mon, Apr 25, 2016 at 09:09:57PM -0600, Alex Henrie wrote: > @@ -129,8 +129,14 @@ static HRESULT WINAPI Timeline_IAMTimeline_CreateEmptyNode(IAMTimeline *iface, I > TIMELINE_MAJOR_TYPE type) > { > TimelineImpl *This = impl_from_IAMTimeline(iface); > - FIXME("(%p)->(%p,%04x): not implemented!\n", This, obj, type); > - return E_NOTIMPL; > + HRESULT hr; > + > + TRACE("(%p)->(%p,%04x)\n", This, obj, type); Any reason for the 04 width specifier here and elsewhere? AFAICT they're not shorts, but maybe I'm missing something. I'd rather print them with "0x%x". Andrew

2 2

Re: [5/5] wininet/tests: Add more tests for INTERNET_INVALID_PORT_NUMBER. (resend)
by Marvin 26 Apr '16

26 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22608 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w1064 (64 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

1 0

Re: [4/5] wininet/tests: Add tests for asynchronous InternetReadFile. (v2)
by Marvin 26 Apr '16

26 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22607 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w1064 (64 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

1 0

Re: [2/5] wininet/tests: Add tests for asynchronous InternetReadFileEx. (v2)
by Marvin 26 Apr '16

26 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22606 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w1064 (64 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

1 0

Re: [PATCH 2/5] qedit: Stub out AMTimelineObj.
by Nikolay Sivov 26 Apr '16

26 Apr '16

On 26.04.2016 6:09, Alex Henrie wrote: > Cc: Andrew Eikum <aeikum(a)codeweavers.com> > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > dlls/qedit/Makefile.in | 3 +- > dlls/qedit/qedit_private.h | 2 + > dlls/qedit/tests/timeline.c | 3 - > dlls/qedit/timeline.c | 10 +- > dlls/qedit/timelineobj.c | 470 ++++++++++++++++++++++++++++++++++++++++++++ > 5 files changed, 482 insertions(+), 6 deletions(-) > create mode 100644 dlls/qedit/timelineobj.c I think it's better to add this to timeline.c. > > diff --git a/dlls/qedit/timeline.c b/dlls/qedit/timeline.c > index 52123a7..0398f28 100644 > --- a/dlls/qedit/timeline.c > +++ b/dlls/qedit/timeline.c > @@ -129,8 +129,14 @@ static HRESULT WINAPI Timeline_IAMTimeline_CreateEmptyNode(IAMTimeline *iface, I > TIMELINE_MAJOR_TYPE type) > { > TimelineImpl *This = impl_from_IAMTimeline(iface); > - FIXME("(%p)->(%p,%04x): not implemented!\n", This, obj, type); > - return E_NOTIMPL; > + HRESULT hr; > + > + TRACE("(%p)->(%p,%04x)\n", This, obj, type); > + > + hr = AMTimelineObj_create(type, obj); > + if (FAILED(hr)) return hr; > + > + return S_OK; > } > You can simply 'return AMTimelineObj_create...;'. > + > +#include <assert.h> This one is not used. > +static ULONG WINAPI TimelineObj_inner_Release(IUnknown *iface) > +{ > + TimelineObjImpl *This = impl_from_IUnknown(iface); > + ULONG ref = InterlockedDecrement(&This->ref); > + > + TRACE("(%p) new ref = %u\n", This, ref); > + > + if (ref == 0) > + { > + CoTaskMemFree(This); > + return 0; > + } > + > + return ref; > +} Extra 'return 0;' does not add anything. > +HRESULT AMTimelineObj_create(TIMELINE_MAJOR_TYPE type, IAMTimelineObj **ppv) > +{ > + TimelineObjImpl* obj = NULL; No need to initialize it. > + > + TRACE("(%d,%p)\n", type, ppv); > + > + switch (type) > + { > + case TIMELINE_MAJOR_TYPE_COMPOSITE: > + case TIMELINE_MAJOR_TYPE_TRACK: > + case TIMELINE_MAJOR_TYPE_SOURCE: > + case TIMELINE_MAJOR_TYPE_TRANSITION: > + case TIMELINE_MAJOR_TYPE_EFFECT: > + case TIMELINE_MAJOR_TYPE_GROUP: > + break; > + default: > + return E_INVALIDARG; > + } What happens to returned pointer on type error? > + > + obj = CoTaskMemAlloc(sizeof(TimelineObjImpl)); > + if (NULL == obj) { > + *ppv = NULL; > + return E_OUTOFMEMORY; > + } > + ZeroMemory(obj, sizeof(TimelineObjImpl)); > + > + obj->ref = 1; > + obj->IUnknown_inner.lpVtbl = &timelineobj_vtbl; > + obj->IAMTimelineObj_iface.lpVtbl = &IAMTimelineObj_VTable; > + > + *ppv = &obj->IAMTimelineObj_iface; > + return S_OK; > +} > memset is not useful, you're setting all the fields anyway. Also, why do you need inner IUnknown for this object?

3 2

Re: kernel32/tests: Add initial tests for GetConsoleFontInfo (v3)
by Marvin 26 Apr '16

26 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22597 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 1511506268 console.c:1445: Test failed: [15] Expected output count to be 0, got 1511506268 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 1511506268 console.c:1689: Test failed: [13] Expected output count to be 0, got 1511506268 console.c:1689: Test failed: [15] Expected output count to be 0, got 1511506268 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 1511506268 === w864 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 2670708688 console.c:1445: Test failed: [15] Expected output count to be 0, got 2670708688 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2670708688 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 2670708688 console.c:1689: Test failed: [15] Expected output count to be 0, got 2670708688 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2670708688 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 795528606 console.c:1445: Test failed: [15] Expected output count to be 0, got 795528606 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 795528606 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 795528606 console.c:1689: Test failed: [15] Expected output count to be 0, got 795528606 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 795528606 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

2 1

Windows 2000 VM timing out
by Hugh McMaster 26 Apr '16

26 Apr '16

The Windows 2000 VM is timing out with the following dialog message: kernel32_test.exe - Entry Point Not Found The procedure entry point InitializeSListHead could not be located in the dynamic link library kernel32.dll. For a screenshot, see https://testbot.winehq.org/JobDetails.pl?Key=22547&log_201=1&scrshot_201=1#… I'm not sure what the cause is. I sent a patch modifying a comment by one character and the same error occurs.

4 6

Re: [PATCH] winemac: Implement the WGL_WINE_query_renderer extension.
by Henri Verbeet 26 Apr '16

26 Apr '16

On 26 April 2016 at 10:29, Ken Thomases <ken(a)codeweavers.com> wrote: > + case WGL_RENDERER_UNIFIED_MEMORY_ARCHITECTURE_WINE: > + /* FIXME: not sure what this means */ Mostly whether the GPU has its own dedicated video memory that's not directly accessible by the CPU, or instead shares the memory between the CPU and GPU. > + case WGL_RENDERER_VERSION_WINE: > + /* FIXME: anything better we can return? */ If the driver doesn't have its own version number, the next best thing is probably the OS version number. This typically matches the final part of the GL_VERSION string.

4 4

Re: [PATCH v4 4/6] d3d11/tests: Add tests for 2D texture RTVs.
by Henri Verbeet 26 Apr '16

26 Apr '16

On 25 April 2016 at 12:25, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &context->ps_cb); > + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create constant buffer, hr %#x.\n", hr); > + } > + > + ID3D11DeviceContext_PSSetShader(context->immediate_context, context->ps, NULL, 0); > + ID3D11DeviceContext_PSSetConstantBuffers(context->immediate_context, 0, 1, &context->ps_cb); > + > + ID3D11DeviceContext_UpdateSubresource(context->immediate_context, (ID3D11Resource *)context->ps_cb, 0, > + NULL, color, 0, 0); There isn't anything wrong with doing it like this, but note that you could also specify the initial contents when creating the buffer.

1 0

Re: [v3 PATCH 1/3] ucrtbase: Implement _initialize_onexit_table()
by Sebastian Lackner 26 Apr '16

26 Apr '16

On 26.04.2016 07:52, Nikolay Sivov wrote: > diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec > index a54a71a..96e0c3b 100644 > --- a/dlls/ucrtbase/ucrtbase.spec > +++ b/dlls/ucrtbase/ucrtbase.spec > @@ -419,7 +419,7 @@ > @ cdecl _i64tow(int64 ptr long) ntdll._i64tow > @ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s > @ cdecl _initialize_narrow_environment() > -@ stub _initialize_onexit_table > +@ cdecl _initialize_onexit_table() MSVCRT__initialize_onexit_table Did you accidentally send an old version?

1 0

Wine Smart Card handle
by Szili Péter 26 Apr '16

26 Apr '16

Hi I using Scard4Wine patch ( http://www.winehq.org/pipermail/wine-devel/2007-April/056432.html ) on Suse Leap 42.1 x64 and Ubuntu 16.04 desktop x86, and my Delphi 7 application, with wine. ( This is test sample program, which tests the smart card reader) http://www.topemail.hu/src/SCardSample.tar.gz Each of the two systems is the same problem: Delphi LoadLibrary() function can not load the winscard.dll. The patch replaces the under linux the /usr/lib/wine/winscard.dll.so With original winscard.dll.so can load the LoadLibrary(). Can someone idea of how the new winscard.dll.so could be used ? Best regards: Szili Péter szilipeter(a)topemail.hu ****************************

1 0

Re: [PATCH 2/2] inetcomm: Implement IMimeBody GetProp
by Marvin 26 Apr '16

26 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22590 Your paranoid android. === wvistau64 (64 bit mimeole) === mimeole.c:387: Test failed: Invalid mask 0x 779e9075 mimeole.c:390: Test failed: Invalid encoding 3 === w2008s64 (64 bit mimeole) === mimeole.c:387: Test failed: Invalid mask 0x 77009075 mimeole.c:390: Test failed: Invalid encoding 3 === w7pro64 (64 bit mimeole) === mimeole.c:387: Test failed: Invalid mask 0x 2c0000 mimeole.c:388: Test failed: Invalid flags 0x2c0000 mimeole.c:390: Test failed: Invalid encoding 3 === w864 (64 bit mimeole) === mimeole.c:387: Test failed: Invalid mask 0x 9 mimeole.c:388: Test failed: Invalid flags 0x9 mimeole.c:389: Test failed: Invalid row number 32757 mimeole.c:390: Test failed: Invalid encoding 3 === w1064 (64 bit mimeole) === mimeole.c:387: Test failed: Invalid mask 0x 5f8400 mimeole.c:388: Test failed: Invalid flags 0x5f8400 mimeole.c:390: Test failed: Invalid encoding 3

1 0

Re: [PATCH 1/2] inetcomm: Implement IMimeBody SetProp
by Marvin 26 Apr '16

26 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22589 Your paranoid android. === wvistau64 (64 bit mimeole) === mimeole.c:378: Test failed: Invalid mask 0x 779e9075 mimeole.c:381: Test failed: Invalid encoding 3 === w2008s64 (64 bit mimeole) === mimeole.c:378: Test failed: Invalid mask 0x 77009075 mimeole.c:381: Test failed: Invalid encoding 3 === w7pro64 (64 bit mimeole) === mimeole.c:378: Test failed: Invalid mask 0x 510000 mimeole.c:379: Test failed: Invalid flags 0x510000 mimeole.c:381: Test failed: Invalid encoding 3 === w864 (64 bit mimeole) === mimeole.c:378: Test failed: Invalid mask 0x 9 mimeole.c:379: Test failed: Invalid flags 0x9 mimeole.c:380: Test failed: Invalid row number 32757 mimeole.c:381: Test failed: Invalid encoding 3 === w1064 (64 bit mimeole) === mimeole.c:378: Test failed: Invalid mask 0x 5d7410 mimeole.c:379: Test failed: Invalid flags 0x5d7410 mimeole.c:381: Test failed: Invalid encoding 3

1 0

RFC: gdi32: add a [fonts] section to win.ini
by Austin English 26 Apr '16

26 Apr '16

This patch is for https://bugs.winehq.org/show_bug.cgi?id=33492, already tested as working. I wanted to send for review first, as I'm not sure if this is the best approach or if someone has a better idea for how to handle it. Thanks, -- -Austin

2 2

Re: [PATCH] shell32: Add SHLimitInputEdit stub.
by Nikolay Sivov 26 Apr '16

26 Apr '16

On 26.04.2016 6:13, Alex Henrie wrote: > Needed for Windows Movie Maker 2.6. > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > dlls/shell32/shell32.spec | 1 + > dlls/shell32/shlfolder.c | 9 +++++++++ > 2 files changed, 10 insertions(+) > > diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec > index 93fd449..7ebd032 100644 > --- a/dlls/shell32/shell32.spec > +++ b/dlls/shell32/shell32.spec > @@ -264,6 +264,7 @@ > 727 stdcall SHGetImageList(long ptr ptr) > 730 stdcall -noname RestartDialogEx(long wstr long long) > 743 stdcall SHCreateFileExtractIconW(wstr long ptr ptr) > + 747 stdcall SHLimitInputEdit(ptr ptr) > Does it actually need explicit ordinal?

2 2

Re: [PATCH 3/5] qedit: Implement IAMTimelineObj_GetTimelineType and add tests.
by Nikolay Sivov 26 Apr '16

26 Apr '16

On 26.04.2016 6:09, Alex Henrie wrote: > static HRESULT WINAPI TimelineObj_GetTimelineType(IAMTimelineObj *iface, TIMELINE_MAJOR_TYPE *type) > { > TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); > - FIXME("(%p)->(%p): not implemented!\n", This, type); > - return E_NOTIMPL; > + TRACE("(%p)->(%p)\n", This, type); > + *type = This->timeline_type; > + return S_OK; > } Is it supposed to handle NULL input?

2 1

Re: [6/6] wininet: Handle INTERNET_INVALID_PORT_NUMBER in HttpOpenRequest.
by Marvin 25 Apr '16

25 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22569 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w1064 (64 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

1 0

Re: [5/6] wininet/tests: Add more tests for INTERNET_INVALID_PORT_NUMBER.
by Marvin 25 Apr '16

25 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22568 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w1064 (64 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

1 0

Re: [4/6] wininet/tests: Add tests for asynchronous InternetReadFile.
by Marvin 25 Apr '16

25 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22567 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w1064 (64 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

1 0

Re: [2/6] wininet/tests: Add tests for asynchronous InternetReadFileEx.
by Marvin 25 Apr '16

25 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22566 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w1064 (64 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2406: Test failed: count was wrong http.c:2407: Test failed: http data wrong, got: Garbage: Header http.c:3070: Test failed: HttpAddRequestHeaders succeeded http.c:3071: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3076: Test failed: code = 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:3076: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

3 2

Re: [v2 PATCH 1/3] ucrtbase: Implement _initialize_onexit_table()
by Piotr Caban 25 Apr '16

25 Apr '16

On 04/24/16 20:51, Nikolay Sivov wrote: > dlls/ucrtbase/tests/onexit.c | 114 +++++++++++++++++++++ Probably we don't need a separate file just for these tests. Could you please put them into a file with more generic name so it can be used for other tests in future. > + memset(&table, 0, sizeof(table)); > + ret = p_initialize_onexit_table(&table); > + ok(ret == 0, "got %d\n", ret); > + ok(table._first == table._last && table._first == table._end, "got first %p, last %p, end %p\n", > + table._first, table._last, table._end); > +todo_wine > + ok(table._first != NULL, "got %p\n", table._first); We probably don't need to be binary compatible but native uses following algorithm (x - random number, 32-bit version): void* encode_ptr(void *p) { DWORD r = (DWORD)p; r = _rotl(r, x); return r^x; } void* decode_ptr(void *p) { DWORD r = (DWORD)p; r = r^x; return _rotr(r, x); } In theory this test may fail if x happens to be 0. Thanks, Piotr

2 1

Re: msvcrt: The fpclass() constants are not defines.
by Piotr Caban 25 Apr '16

25 Apr '16

Hi, I don't know how to review this patch. Alexandre, could you please take a look on it? For me the patch may go in and if it causes any problems configure check may be added. I guess we no longer care about the compiler it was added for. Thanks, Piotr

1 0

Re: shell32/tests: Tests for broken apps that check GetLastError() after SHFileOperation()
by Marvin 25 Apr '16

25 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22483 Your paranoid android. === wvistau64 (32 bit shlfileop) === shlfileop.c:297: Test failed: SHGetFileInfoA(test4.txt/) should return 1, got 0x0 shlfileop.c:2455: Test failed: SHGetNewLinkInfoA failed, err=0 shlfileop.c:2464: Test failed: SHGetNewLinkInfoA failed, err=0 shlfileop.c:2468: Test failed: does not start with C:\Users\Public\Documents\testdir2 shlfileop.c:2471: Test failed: does not end with .lnk shlfileop.c:83: Test failed: Failure to open file shlfileop.c:2477: Test failed: SHGetNewLinkInfoA failed, err=0 shlfileop.c:2481: Test failed: Y does not start with C:\Users\Public\Documents\testdir2 shlfileop.c:2484: Test failed: Y does not end with .lnk === wvistau64 (64 bit shlfileop) === shlfileop.c:297: Test failed: SHGetFileInfoA(test4.txt/) should return 1, got 0x0 shlfileop.c:2455: Test failed: SHGetNewLinkInfoA failed, err=1008 shlfileop.c:2464: Test failed: SHGetNewLinkInfoA failed, err=1008 shlfileop.c:2468: Test failed: does not start with C:\Users\Public\Documents\testdir2 shlfileop.c:2471: Test failed: does not end with .lnk shlfileop.c:83: Test failed: Failure to open file shlfileop.c:2477: Test failed: SHGetNewLinkInfoA failed, err=1008 shlfileop.c:2481: Test failed: does not start with C:\Users\Public\Documents\testdir2 shlfileop.c:2484: Test failed: does not end with .lnk shlfileop.c:2486: Test failed: and are the same

2 1

Re: [v2 PATCH 2/3] ucrtbase: Implement _register_onexit_function()
by Piotr Caban 25 Apr '16

25 Apr '16

On 04/24/16 20:51, Nikolay Sivov wrote: > + len = table->_end - table->_first; > + > + /* grow if full */ > + if (table->_last == table->_end) > + { > + table->_first = MSVCRT_realloc(table->_first, 2 * len * sizeof(void *)); > + table->_end = table->_first + 2 * len; > + table->_last = table->_first + len; > + } Please move len initialization/definition into the if block. Also please handle allocation failure. Thanks, Piotr

1 0

Re: [PATCH] hidclass.sys: add missing case/missing heapfree (Coverity)
by Aric Stewart 25 Apr '16

25 Apr '16

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> On 4/23/16 1:03 PM, Marcus Meissner wrote: > 1358558 Resource leak > > (actually switch on the enum, then the compiler will see missing cases) > > 2nd try, also use variable in debug directly > > Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> > --- > dlls/hidclass.sys/pnp.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c > index d97184f..87b19ac 100644 > --- a/dlls/hidclass.sys/pnp.c > +++ b/dlls/hidclass.sys/pnp.c > @@ -292,10 +292,9 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) > case IRP_MN_QUERY_ID: > { > BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; > - ULONG type = irpsp->Parameters.QueryId.IdType; > WCHAR *id = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR)*REGSTR_VAL_MAX_HCID_LEN); > - TRACE("IRP_MN_QUERY_ID[%i]\n", type); > - switch (type) > + TRACE("IRP_MN_QUERY_ID[%i]\n", irpsp->Parameters.QueryId.IdType); > + switch (irpsp->Parameters.QueryId.IdType) > { > case BusQueryHardwareIDs: > case BusQueryCompatibleIDs: > @@ -326,6 +325,10 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) > irp->IoStatus.Information = (ULONG_PTR)id; > rc = STATUS_SUCCESS; > break; > + case BusQueryDeviceSerialNumber: > + FIXME("BusQueryDeviceSerialNumber not implemented\n"); > + HeapFree(GetProcessHeap(), 0, id); > + break; > } > break; > } >

1 0

Re: kernel32: Print a FIXME only once in LCMapStringEx
by Andrew Eikum 25 Apr '16

25 Apr '16

On Mon, Apr 25, 2016 at 04:58:55PM +0200, Louis Lenders wrote: > diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c > index 7418da9..8901870 100644 > --- a/dlls/kernel32/locale.c > +++ b/dlls/kernel32/locale.c > @@ -2974,10 +2974,13 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW > LPNLSVERSIONINFO version, LPVOID reserved, LPARAM lparam) > { > LPWSTR dst_ptr; > + static int once; > > if (version) FIXME("unsupported version structure %p\n", version); > if (reserved) FIXME("unsupported reserved pointer %p\n", reserved); > - if (lparam) FIXME("unsupported lparam %lx\n", lparam); > + > + if (!once++) > + if (lparam) FIXME("unsupported lparam %lx\n", lparam); I think you got the if statements backwards here. You should print the first time lparam is non-zero, not only if it's non-zero on the first LCMapStringEx call. Andrew

1 0

Re: Wine 1.8.1
by Michael Stefaniuc 25 Apr '16

25 Apr '16

Hello Berto, On 04/25/2016 04:13 PM, Berto Niker wrote: > How do I install Wine 1.8.1 in Ubuntu (Xenial and Trusty)? I added the current Stable version is 1.8.2 already. > repository and it only has 1.8.0. Wine Stable is not part yet of the repositories provided by winehq.org. It is planned though. > I am not interested in the development build 1.9.x. I do not want to > worry about things breaking every two weeks. Sure, that's the reason we do Wine Stable. bye michael

1 0

Re: [PATCH 6/6] ddraw/tests: Test creating flippable cubemaps.
by Bruno Jesus 25 Apr '16

25 Apr '16

On Mon, Apr 25, 2016 at 12:25 PM, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > dlls/ddraw/surface.c | 2 ++ > dlls/ddraw/tests/ddraw7.c | 50 Hi, the subject says you are adding tests but you also change dll source, was it a leftover? Or maybe the subject should be changed to reflect the source change IMO.

2 1

Re: [PATCH 6/6] ddraw/tests: Test creating flippable cubemaps.
by Marvin 25 Apr '16

25 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22544 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: Experimental 64 bit OS X packages ready for testing
by Diego Vicioso 25 Apr '16

25 Apr '16

Any updates if it will be included into normal wine or future wine staging packages? Sent from my mac

2 1

Re: [PATCH] kernel32/tests: Add initial tests for GetConsoleFontInfo (v2)
by Sebastian Lackner 25 Apr '16

25 Apr '16

On 22.04.2016 15:21, Hugh McMaster wrote: > Changes since v1: Use CONSOLE_FONT_INFO instead of undocumented CONSOLE_FONT. > The structure is identical. > > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > dlls/kernel32/tests/console.c | 57 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 57 insertions(+) > You'll have to add a stub first, otherwise it breaks the tests: $ (cd dlls/kernel32/tests/; make console.ok) ../../../tools/runtest -q -P wine -T ../../.. -M kernel32.dll -p kernel32_test.exe.so console && touch console.ok fixme:console:GetConsoleProcessList ((nil),0): stub fixme:console:GetConsoleProcessList ((nil),1): stub fixme:console:GetConsoleProcessList (0x118ca0,0): stub fixme:console:GetConsoleProcessList (0x118ca0,1): stub fixme:console:GetConsoleProcessList (0x118ca0,0): stub fixme:console:SetConsoleFont (0x63, 0): stub! fixme:console:SetConsoleFont (0x63, 0): stub! wine: Call from 0x7b43b8a2 to unimplemented function KERNEL32.dll.GetConsoleFontInfo, aborting wine: Unimplemented function KERNEL32.dll.GetConsoleFontInfo called at address 0x7b43b8a2 (thread 0009), starting debugger...

2 2

Re: Fix a heap corruption when printing specific REG_MULTI_SZ values.
by Hugh McMaster 25 Apr '16

25 Apr '16

On Saturday, 23 April 2016 3:35 AM, Sebastian Lackner wrote: >The current calculation does not take the terminating \0 into account. > -buffer = HeapAlloc(GetProcessHeap(), 0, tmp_size * 2); > +buffer = HeapAlloc(GetProcessHeap(), 0, tmp_size * 2 + sizeof(WCHAR)); Which particular cases cause the heap corruption? -- Hugh McMaster

2 4

Re: [PATCH 3/4] d3drm/tests: Replace test_Texture. (v2)
by Stefan Dösinger 25 Apr '16

25 Apr '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-04-24 um 16:50 schrieb Aaryaman Vasishta: > + hr = IDirect3DRMTexture_GetClassName(texture1, &size, cname); > + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); > + ok(size == sizeof("Texture") - 1, "wrong size: %u\n", size); > + ok(!strcmp(cname, "Texture"), "Expected cname to be \"Texture\", but got \"%s\"\n", cname); The strcmp check here is misleading. The content is a leftover from the previous successful call. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXHSYsAAoJEN0/YqbEcdMwVzUQAI5igH0GyGwby4/FQMWpOaDl gXwxyST6BOhwnMfSNSdY/yFT0WqgLxm23+uE1fDsApaENRTEn1JzfSC8/DzeSeEd KHv4QU2KeHlRtLl01CWJclwGgwgdCaP1b1+8mSzxXtWgfjZ2RRtGJON4STzDqLvt G8DYYKJVEAgGQXq2o4N0ZtqRJmmOyOY9iR6Etwz1SoUOe3PgKHwbHEeAJ9YmbbzV zJKkYxdEjuRcyO6Z5xXb5XLV2OBdYD/pqYPMwodQWfJIaht0Ui2GYrSI7Tw1b+DL d/B6M6gYfYm9DAivlL5DflZoyLI4OIm95BRmOgtJZ3EY+qsR0UPuHEybCZnzy0u5 0qQNTGs4+sWecIcFQMmtOqj5wcesV0XPLiRr3nAPMuuIaiBNO3Yyvxu2f/KyLIEa 3E3u6HmJtnyLJPK1btsc1mjsr21LpBA2sQ2AXYV/9wfQyIBhKUdk9gsC9lYNQEvm eVRCtTg4BDIUTxze8lXGqslyio/5IEPr1dX0suX5Rj61tpcDgp6C1MdSiHZkliM3 dTuk7Wu3dfdXCAZfGS/J+QfoQfXwP6NqYhIx6bzY48XGeL/N+m9rGC2lG1mMVROu xW5lgCuZ5/Vt2Z7+qzfEVuI0HxQ+cXO86IEq1RClvszje+1stblLpTQDrAg/hy6G X1q4jNhSjnxRP6Q0r2Ls =39F6 -----END PGP SIGNATURE-----

2 3

Re: [PATCH 2/2] ucrtbase: Implement _register_onexit_function()
by Sebastian Lackner 24 Apr '16

24 Apr '16

On 24.04.2016 20:05, Nikolay Sivov wrote: > + table->_first = MSVCRT_calloc(sizeof(void *), 32); Not really an issue, but shouldn't the first argument be the counter, and the second one the size?

2 1

Re: [PATCH 1/2] ucrtbase: Implement _initialize_onexit_table()
by Sebastian Lackner 24 Apr '16

24 Apr '16

On 24.04.2016 20:05, Nikolay Sivov wrote: > diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec > index a54a71a..96e0c3b 100644 > --- a/dlls/ucrtbase/ucrtbase.spec > +++ b/dlls/ucrtbase/ucrtbase.spec > @@ -419,7 +419,7 @@ > @ cdecl _i64tow(int64 ptr long) ntdll._i64tow > @ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s > @ cdecl _initialize_narrow_environment() > -@ stub _initialize_onexit_table > +@ cdecl _initialize_onexit_table() MSVCRT__initialize_onexit_table Shouldn't there be one "ptr" argument? Same for the other spec files. > @ cdecl _initialize_wide_environment() > @ cdecl _initterm(ptr ptr) > @ cdecl _initterm_e(ptr ptr) >

1 0

Re: [PATCH 1/4] d3drm: Use sizeof instead of strlen in d3drm_texture3_GetClassName.
by Nikolay Sivov 24 Apr '16

24 Apr '16

On 24.04.2016 18:50, Aaryaman Vasishta wrote: > This size of class name turns out to be equal to sizeof("Texture") which is strlen("Texture") + 1. This was recently discovered while testing the size returned by GetClassName. > > Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > --- > dlls/d3drm/texture.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c > index f81fc03..60374d3 100644 > --- a/dlls/d3drm/texture.c > +++ b/dlls/d3drm/texture.c > @@ -796,7 +796,7 @@ static HRESULT WINAPI d3drm_texture3_GetClassName(IDirect3DRMTexture3 *iface, DW > { > TRACE("iface %p, size %p, name %p.\n", iface, size, name); > > - if (!size || *size < strlen("Texture") || !name) > + if (!size || *size < sizeof("Texture") || !name) > return E_INVALIDARG; > > strcpy(name, "Texture"); > GetClassName() is duplicated for every object, it makes sense to introduce a helper function eventually.

2 1

Re: [PATCH 2/3] d3drm/tests: Replace test_Texture.
by Stefan Dösinger 24 Apr '16

24 Apr '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-04-24 um 06:40 schrieb Aaryaman Vasishta: > + size = 1; > + hr = IDirect3DRMTexture_GetClassName(texture1, &size, cname); > + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); > + size = sizeof(cname); > + hr = IDirect3DRMTexture_GetClassName(texture1, &size, cname); > + ok(SUCCEEDED(hr), "Cannot get classname (hr = %x)\n", hr); > + ok(size == sizeof("Texture"), "wrong size: %u\n", size); sizeof("Texture") is confusing IMHO. I had to look up the C rules on string literals to make sure it does what you want :-) . Though I'm not sure if its better than strlen("Texture") + 1, so it's your call. However, the current implementation in d3drm_texture3_GetClassName confuses the two. I recommend adding a test for sizeof("Texture") - 1 and an exactly matching size. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXHJxZAAoJEN0/YqbEcdMwMAkP/0JEXejefj/awhnJGh5zQlg9 07gvcDjH+KvsHYbJsWOA8GE3+JcUJrqpHA8nqO2Uxmy1mg26EECNtRFTjfWJ4oQM iHcVgVurTb6rx6UZpcLkoy/BQ4fvWQFtWxfL2J9ZDO2TVt+0oeGSurkv5ywylTmq 5RZa5lFhnaeMyWw6hbtXNwsPXMhi+tDdHZTYVakJGRa72deO23ZrWuzbHzMfnlDx /SnGnSnFF9JcWLkLQMqeiQ+Q2Ztn+PHo15EjAye3hk1gvVYKx5xx7+Hef9l4/1dG Cqc2I+4GwE86FmrBkqT1noF6HDo4+6evHi+JrW6d0WFH7I/k3D+5SUtaqtBRtraC AuS4Kwsqri4wpVeqz6zsX8BsneQHQzkB87EXEC81d7W6fTPAYT1YoQp2zDPxP32G lIwd3bxtdyYA91dNTCGx8arKEpBXhuKqh0ahI8FrRBiuZ20JVIvosiVBxpWHYsiV 9X3smnaiYrL6sZTPtbcHbcs5shbuycpzm05EB5noSbc+P6ur5/q4Q9nSH86OYAIr mJBZWg6pE9N1zcko6KTmB//z7NGYms8knxVQYGVgtRgZaNk8+mVaeedgdbnrIMFj xsdTX8UGtOAs7mJ6E496xq4P7bMxK5B0BSoChtaJV3ZeS9wLD/JId/1Z7l/DvVwn 0EDb2DPmwv7EbEWz7cAH =MI19 -----END PGP SIGNATURE-----

2 2

Re: [PATCH 3/3] d3drm/tests: Add tests for IDirect3DRMTexture{2-3}_InitFromImage. (v2)
by Stefan Dösinger 24 Apr '16

24 Apr '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, I think it'd be a good idea to add some lines testing InitFromImage on a texture that was created with CreateTexture and trying to call InitFromImage twice (with the first call succeeding). Am 2016-04-24 um 06:46 schrieb Aaryaman Vasishta: > + /* InitFromImage tests */ > + d3drm_img = NULL; > + hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, (void **)&texture2); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %x).\n", hr); > + ref2 = get_refcount((IUnknown *)texture2); Did you forget IDirect3DRM::CreateObject(Texture1), or is there a reason why it is omitted? > + hr = IDirect3DRMTexture2_InitFromImage(texture2, NULL); > + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %x.\n", hr); > + ref3 = get_refcount((IUnknown *)texture2); > + ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); You're not testing the reference count of d3drm1/2/3. My guess is that you plan to add this later since the InitFrom() increments it, and not the create. Is my understanding of your plans correct? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXHJtCAAoJEN0/YqbEcdMwAhgQAJXR10NMu88OEslWcX2iUSSg rUXk7WcCaQVHHlGFwQwddtFLrX245idLScYxm8N9CvG3kyHxx91tQ3UH6wT+QHAv No6IuMc0menrh1g2mP08/Ci44sd7Hy01HS7K8A9+/rdwUnIhb3pYiAxB8673/7he ruXnPpYY/Mhi+8I1BAQA17qy5rArUFQWHGoth+18PnPdI9VELKlkZg0Y8R/ITqdu jgLkw1zKsKZS17qvwTyz+lyxmhC2mAjIMQu/WD/lVZOwXPTFUmSqPfUke6nyTFfA ffJL16e9C5CpyD+dCT+Rc3AUoboBo+JrQz4Qif4xOW+LhNY7fZeqt4f1Pd7+Zxqe X3sr7jVDTJY3d//bWy7eW1Ow7zixawhsWXa0cj6Z6TuIV4ruMvOK6QpZ2qb1IvmS BCTGoRI6DYF6bRDZLCirbz4nOB8CNTtO+erLhh5uHCP8wtN1eYC3/5rSjGjJACrT IBQ7g/l45/oiCkmVLug5kxUqgXXX0GoVbrod0MiBd0snDMwmev1T+xNHFdsfR9La 8AKBVF6eH3FqRo0Co6PGIvgKkk0ItuAUBPFkrvaREnzTwQO5XrSbCA54FeM8YFn3 FZH9ePNGENyWJD98SI1Laluw/9GiAusQynkJALSen9Aqm1pfhfH2OSuxaFqg0IfW vl8vPREqFJGtCGx9fQU/ =FjQh -----END PGP SIGNATURE-----

2 1

Wine inside Xephyr on OSX
by Bruno Jesus 23 Apr '16

23 Apr '16

Hi, all. In Debian I have been using Xephyr to test some applications when virtual desktop is not enough, so far so good. Now I was trying to do the same in an OSX, so I have opened Xephyr and DISPLAY=:2 xeyes work but Wine windows are not created inside the Xephyr window as if the DISPLAY is completely ignored. Is there any way to make this work? Best wishes, Bruno

3 5

Re: [PATCH] d3dx10: Implement D3DX10UnsetAllDeviceObjects()
by Marvin 23 Apr '16

23 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22481 Your paranoid android. === build (build) === Make failed

1 0

Re: [PATCH 6/8] ddraw: Return early in d3d_device7_DrawIndexedPrimitiveVB() with a 0 vertex or index count.
by Marvin 22 Apr '16

22 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22465 Your paranoid android. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 5/8] ddraw: Return early in d3d_device7_DrawPrimitive() with a 0 vertex count.
by Marvin 22 Apr '16

22 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22464 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 4/8] ddraw: Return early in d3d_device7_DrawPrimitiveStrided() with a 0 vertex count.
by Marvin 22 Apr '16

22 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22463 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 3/8] ddraw: Return early in d3d_device7_DrawIndexedPrimitive() with a 0 vertex or index count.
by Marvin 22 Apr '16

22 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22462 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 2/8] ddraw: Return early in d3d_device7_DrawIndexedPrimitiveStrided() with a 0 vertex or index count.
by Marvin 22 Apr '16

22 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22461 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 1/8] ddraw/tests: Add some tests for draw parameter validation.
by Marvin 22 Apr '16

22 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22460 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

How do I register a DirectShow class?
by Alex Henrie 22 Apr '16

22 Apr '16

Hi, I've been trying to fix <https://bugs.winehq.org/show_bug.cgi?id=32473>, you can see my work at <https://github.com/alexhenrie/wine/commits/master>. I defined the AMTimeline class and its interfaces and I added a complete stub implementation, but I'm still getting the same error: err:ole:CoGetClassObject class {78530b75-61f9-11d2-8cad-00a024580902} not registered err:ole:CoGetClassObject no class object {78530b75-61f9-11d2-8cad-00a024580902} could be created for context 0x1 What am I missing? -Alex

3 3

Re: [PATCH] qedit: List parameters in order in create function traces.
by Andrew Eikum 22 Apr '16

22 Apr '16

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Thanks. Just for my own information, are you working in this area? I'm working on video embedding in Office 2010 (Bug 40179) at the moment. Andrew On Fri, Apr 22, 2016 at 12:18:00AM -0600, Alex Henrie wrote: > Cc: Andrew Eikum <aeikum(a)codeweavers.com> > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > dlls/qedit/mediadet.c | 2 +- > dlls/qedit/samplegrabber.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c > index 9098223..53ab75a 100644 > --- a/dlls/qedit/mediadet.c > +++ b/dlls/qedit/mediadet.c > @@ -640,7 +640,7 @@ static const IMediaDetVtbl IMediaDet_VTable = > HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { > MediaDetImpl* obj = NULL; > > - TRACE("(%p,%p)\n", ppv, pUnkOuter); > + TRACE("(%p,%p)\n", pUnkOuter, ppv); > > obj = CoTaskMemAlloc(sizeof(MediaDetImpl)); > if (NULL == obj) { > diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c > index e9e4906..946dba9 100644 > --- a/dlls/qedit/samplegrabber.c > +++ b/dlls/qedit/samplegrabber.c > @@ -1262,7 +1262,7 @@ HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) > ISeekingPassThru *passthru; > HRESULT hr; > > - TRACE("(%p,%p)\n", ppv, pUnkOuter); > + TRACE("(%p,%p)\n", pUnkOuter, ppv); > > obj = CoTaskMemAlloc(sizeof(SG_Impl)); > if (NULL == obj) { > -- > 2.8.0 >

2 1

Re: [v6 PATCH] comctl32/tooltip: Protect TTM_ADDTOOLW from invalid text pointers
by Nikolay Sivov 22 Apr '16

22 Apr '16

On 22.04.2016 10:55, Alistair Leslie-Hughes wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=10347 > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/comctl32/tests/tooltips.c | 39 +++++++++++++++++++++++++++++++++++++++ > dlls/comctl32/tooltips.c | 5 ++++- > 2 files changed, 43 insertions(+), 1 deletion(-) > > diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c > index 3382fce..db3d3c4 100644 > --- a/dlls/comctl32/tests/tooltips.c > +++ b/dlls/comctl32/tests/tooltips.c > @@ -446,6 +446,45 @@ static void test_gettext(void) > r = SendMessageW(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&toolinfoW); > ok(!r, "Adding the tool to the tooltip succeeded!\n"); > > + /* lpszText with an invalid address */ > + toolinfoW.cbSize = sizeof(TTTOOLINFOW); > + toolinfoW.hwnd = notify; > + toolinfoW.hinst = GetModuleHandleA(NULL); > + toolinfoW.uFlags = 0; > + toolinfoW.uId = 0; > + toolinfoW.lpszText = (LPWSTR)0xdeadbeef; > + toolinfoW.lParam = 0; > + GetClientRect(hwnd, &toolinfoW.rect); > + r = SendMessageA(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&toolinfoW); > + ok(!r, "Adding the tool to the tooltip succeeded!\n"); > + > + /* lpszText with an callback address */ > + toolinfoW.cbSize = sizeof(TTTOOLINFOW); > + toolinfoW.hwnd = notify; > + toolinfoW.hinst = GetModuleHandleA(NULL); > + toolinfoW.uFlags = 0; > + toolinfoW.uId = 0; > + toolinfoW.lpszText = LPSTR_TEXTCALLBACKW; > + toolinfoW.lParam = 0; > + GetClientRect(hwnd, &toolinfoW.rect); > + r = SendMessageA(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&toolinfoW); > + todo_wine ok(!r, "Adding the tool to the tooltip succeeded!\n"); > + This is broken, 'notify' is invalid at this point, take a look at a patch I sent couple days ago. Also these tests don't work for me even with valid string pointers, and with reduce cbSize and invalid pointers they crash on Windows. So the whole idea might be wrong. > if (0) /* crashes on NT4 */ > { > toolinfoW.hwnd = NULL; > diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c > index 8bf6919..804e9ed 100644 > --- a/dlls/comctl32/tooltips.c > +++ b/dlls/comctl32/tooltips.c > @@ -1038,7 +1038,10 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) > infoPtr->hwndSelf, ti->hwnd, ti->uId, > (ti->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : ""); > > - if (ti->cbSize >= TTTOOLINFOW_V2_SIZE && !ti->lpszText && isW) > + if (ti->cbSize >= TTTOOLINFOW_V2_SIZE && isW > + && !TOOLTIPS_IsCallbackString(ti->lpszText, isW) > + && !(ti->lpszText && IS_INTRESOURCE(ti->lpszText)) > + && IsBadStringPtrW(ti->lpszText, sizeof(WCHAR)) ) > return FALSE; Text check is wrong.

1 0

Re: [PATCH] kernel32/tests: Add initial tests for GetConsoleFontInfo (v2)
by Marvin 22 Apr '16

22 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22458 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2703919542 console.c:1445: Test failed: [15] Expected output count to be 0, got 2703919542 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2703919542 console.c:1689: Test failed: [13] Expected output count to be 0, got 2703919542 console.c:1689: Test failed: [15] Expected output count to be 0, got 2703919542 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2703919542 === w864 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 1919911434 console.c:1445: Test failed: [15] Expected output count to be 0, got 1919911434 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 1919911434 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 1919911434 console.c:1689: Test failed: [15] Expected output count to be 0, got 1919911434 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 1919911434 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 418781008 console.c:1445: Test failed: [15] Expected output count to be 0, got 418781008 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 418781008 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 418781008 console.c:1689: Test failed: [15] Expected output count to be 0, got 418781008 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 418781008 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

1 0

Re: [PATCH v4 5/7] wined3d: Implement readback from 2D array textures using glGet[Compressed]TexImage().
by Henri Verbeet 22 Apr '16

22 Apr '16

On 22 April 2016 at 11:18, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + if (surface->texture_target == GL_TEXTURE_2D_ARRAY) > + { > + /* We don't expect to ever need to emulate NP2 textures when we have EXT_texture_array. */ > + if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) > + { > + FIXME("Cannot download surface %p, level %u, layer %u.\n", > + surface, surface->texture_level, surface->texture_layer); > + return; > + } Note that you can enforce that in texture_init(). It currently checks for WINED3DUSAGE_LEGACY_CUBEMAP, but it would be easy to check the layer count instead.

1 0

Re: [PATCH] dwrite: Implement newer version of CreateFontFromLOGFONT()
by Jacek Caban 22 Apr '16

22 Apr '16

Hi Nikolay, On 04/21/16 19:48, Nikolay Sivov wrote: > + hr = IDWriteFontCollection_FindFamilyName(collection, logfont->lfFaceName, &index, &exists); > + if (FAILED(hr)) { > + IDWriteFontCollection_Release(collection); > + goto done; > + } You release collection twice in error path. Cheers, Jacek

1 0

Re: [04/10] webservices: Add support for reading double values.
by Hans Leidekker 22 Apr '16

22 Apr '16

On Fri, 2016-04-22 at 09:42 +0200, Hans Leidekker wrote: Please disregard this patch, Henri pointed out a problem with the use of strtod.

1 0

Re: kernel32/tests: Add initial tests for GetConsoleFontInfo
by Marvin 22 Apr '16

22 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22421 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 851146013 console.c:1445: Test failed: [15] Expected output count to be 0, got 851146013 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 851146013 console.c:1689: Test failed: [13] Expected output count to be 0, got 851146013 console.c:1689: Test failed: [15] Expected output count to be 0, got 851146013 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 851146013 === w864 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 844049133 console.c:1445: Test failed: [15] Expected output count to be 0, got 844049133 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 844049133 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 844049133 console.c:1689: Test failed: [15] Expected output count to be 0, got 844049133 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 844049133 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 3107847202 console.c:1445: Test failed: [15] Expected output count to be 0, got 3107847202 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3107847202 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 3107847202 console.c:1689: Test failed: [15] Expected output count to be 0, got 3107847202 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3107847202 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w864 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

2 1

Re: [PATCH] wined3d: Add detection for NVIDIA GTX TITAN Series
by Henri Verbeet 22 Apr '16

22 Apr '16

On 22 April 2016 at 09:55, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > @@ -1764,7 +1768,9 @@ cards_nvidia_binary[] = > {"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */ > {"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ > {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ > - {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ > + {"GTX TITAN", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ > + {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITANB}, /* Geforce 700 - highend */ > + {"GTX TITAN Z", CARD_NVIDIA_GEFORCE_GTXTITANZ}, /* Geforce 700 - highend */ That doesn't work. The strings are matched in order, so once "GTX TITAN" is matched, "GTX TITAN Black" and "GTX TITAN Z" won't even be tried.

1 0

Re: Use todo_wine_if() in tests.
by Marvin 22 Apr '16

22 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22441 Your paranoid android. === w7u (32 bit capture) === capture.c:181: Test failed: Position 1719 expected 0 capture.c:231: Test failed: Position 3063 expected 2167 capture.c:262: Test failed: Position 3063 expected 2167 capture.c:324: Test failed: Position 4407 gap 1792 capture.c:348: Test failed: Position 5751 expected 4855 capture.c:373: Test failed: Position 7095 expected 5303 === w7pro64 (32 bit capture) === capture.c:424: Test failed: Valid IAudioCaptureClient_GetBuffer returns 08890001 === w8 (32 bit capture) === capture.c:231: Test failed: Position 2167 expected 567 capture.c:262: Test failed: Position 2167 expected 567 capture.c:324: Test failed: Position 3191 gap 2176 capture.c:328: Test failed: GCP 13440 vs. BufferSize 21996 capture.c:348: Test failed: Position 4279 expected 3639 capture.c:373: Test failed: Position 5303 expected 4087 capture.c:374: Test failed: flags 1 === w864 (32 bit capture) === capture.c:181: Test failed: Position 1015 expected 0 capture.c:231: Test failed: Position 2167 expected 1463 capture.c:262: Test failed: Position 2167 expected 1463 capture.c:324: Test failed: Position 3191 gap 1280 capture.c:328: Test failed: GCP 13888 vs. BufferSize 21996 capture.c:348: Test failed: Position 4343 expected 3639 capture.c:349: Test failed: flags 1 capture.c:373: Test failed: Position 4791 expected 4087 === w1064 (32 bit capture) === capture.c:181: Test failed: Position 1079 expected 0 capture.c:231: Test failed: Position 2167 expected 1527 capture.c:262: Test failed: Position 2167 expected 1527 capture.c:324: Test failed: Position 4151 gap 2176 capture.c:328: Test failed: GCP 11648 vs. BufferSize 21996 capture.c:348: Test failed: Position 5239 expected 4599 capture.c:349: Test failed: flags 1 capture.c:373: Test failed: Position 5687 expected 5047 === w864 (64 bit capture) === capture.c:181: Test failed: Position 1015 expected 0 capture.c:231: Test failed: Position 2167 expected 1463 capture.c:262: Test failed: Position 2167 expected 1463 capture.c:324: Test failed: Position 3127 gap 1216 capture.c:348: Test failed: Position 4215 expected 3575 capture.c:373: Test failed: Position 5303 expected 4023 === w1064 (64 bit capture) === capture.c:181: Test failed: Position 1143 expected 0 capture.c:231: Test failed: Position 2167 expected 1591 capture.c:262: Test failed: Position 2167 expected 1591 capture.c:324: Test failed: Position 4215 gap 2176 capture.c:328: Test failed: GCP 11648 vs. BufferSize 21996 capture.c:348: Test failed: Position 5303 expected 4663 capture.c:349: Test failed: flags 1 capture.c:373: Test failed: Position 7287 expected 5111 capture.c:374: Test failed: flags 1

1 0

Re: [1/2] shell32: Check IsWow64Process() before calling Wow64 functions.
by Nikolay Sivov 22 Apr '16

22 Apr '16

On 21.04.2016 3:12, Olivier F. R. Dierick wrote: > See bug 36838 for comments and discussion. > > Supersedes patch submission 121402. > > Better version of the patch. Call IsWow64Process() only once on dll > initialization and setup a global variable. > >>From e7b7317755faff75b960f9143b2195344113a9a4 Mon Sep 17 00:00:00 2001 > From: "Olivier F. R. Dierick" <o.dierick(a)piezo-forte.be> > Date: Wed, 20 Apr 2016 06:45:38 +0200 > Subject: shell32: Check IsWow64Process() before calling Wow64 functions. > > Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> > --- > dlls/shell32/shell32_main.c | 3 +++ > dlls/shell32/shell32_main.h | 1 + > dlls/shell32/shfldr_unixfs.c | 6 ++++-- > 3 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c > index 74deecd..98e7fbf 100644 > --- a/dlls/shell32/shell32_main.c > +++ b/dlls/shell32/shell32_main.c > @@ -1255,6 +1255,7 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO > *pdvi) > * > */ > HINSTANCE shell32_hInstance = 0; > +BOOL is_wow64 = FALSE; > > > /************************************************************************* > @@ -1277,6 +1278,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD > fdwReason, LPVOID fImpLoad) > GetModuleFileNameW(hinstDLL, swShell32Name, MAX_PATH); > swShell32Name[MAX_PATH - 1] = '\0'; > > + if (!IsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 > = FALSE; > + > InitChangeNotifications(); > break; > > diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h > index 492f79f..7a4d9b2 100644 > --- a/dlls/shell32/shell32_main.h > +++ b/dlls/shell32/shell32_main.h > @@ -42,6 +42,7 @@ > */ > extern HMODULE huser32 DECLSPEC_HIDDEN; > extern HINSTANCE shell32_hInstance DECLSPEC_HIDDEN; > +extern BOOL is_wow64 DECLSPEC_HIDDEN; > > /* Iconcache */ > #define INVALID_INDEX -1 > diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c > index be1ba81..d9b1320 100644 > --- a/dlls/shell32/shfldr_unixfs.c > +++ b/dlls/shell32/shfldr_unixfs.c > @@ -414,7 +414,8 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, > char *pszCanonicalPath) > dospath_end = dospath + lstrlenW(dospath); > /* search for the most valid UNIX path possible, then append > missing > * path parts */ > - Wow64DisableWow64FsRedirection(&redir); > + if(is_wow64) > + Wow64DisableWow64FsRedirection(&redir); > while(!(pszUnixPath = wine_get_unix_file_name(dospath))){ > if(has_failed){ > *dospath_end = '/'; > @@ -428,7 +429,8 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, > char *pszCanonicalPath) > } > *dospath_end = '\0'; > } > - Wow64RevertWow64FsRedirection(redir); > + if(is_wow64) > + Wow64RevertWow64FsRedirection(redir); > if(dospath_end < dospath) > return FALSE; > strcat(szPath, pszUnixPath + cDriveSymlinkLen); > Like I said in bug comment, doing this is depending on a side effect. SHFileOperation() could do anything internally, if you want to have consistent ERROR_SUCCESS last error (even though it's kind of wrong to check it, since it returns error code already), why not force it in SHFileOperation() directly? Changing internal path is wrong in my opinion.

3 5

Re: shell32/tests: A spelling fix for an shlfolder ok() message.
by Marvin 21 Apr '16

21 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22438 Your paranoid android. === w1064 (32 bit shlfolder) === shlfolder.c:1591: Test failed: IShellFolder_GetDisplayNameOf(NULL) failed! hr = 80070057 === w1064 (64 bit shlfolder) === shlfolder.c:1591: Test failed: IShellFolder_GetDisplayNameOf(NULL) failed! hr = 80070057

1 0

Re: urlmon/tests: Fix a spelling error in a uri comment.
by Marvin 21 Apr '16

21 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22436 Your paranoid android. === w1064 (32 bit uri) === uri.c:7615: Test failed: Expected google.com.uk but got L"com.uk" on uri_tests[71].str_props[3]. uri.c:7615: Test failed: Expected google.uk.1 but got L"uk.1" on uri_tests[73].str_props[3]. uri.c:7613: Test failed: GetPropertyBSTR returned 0x00000000, expected 0x00000001. On uri_tests[76].str_props[3]. uri.c:7615: Test failed: Expected but got L".uk" on uri_tests[76].str_props[3]. uri.c:7615: Test failed: Expected google.com.[] but got L"com.[]" on uri_tests[77].str_props[3]. uri.c:7800: Test failed: Error: Expected google.com.uk but got L"com.uk" on uri_tests[71]. uri.c:7800: Test failed: Error: Expected google.uk.1 but got L"uk.1" on uri_tests[73]. uri.c:7798: Test failed: Error: GetDomain returned 0x00000000, expected 0x00000001 on uri_tests[76]. uri.c:7800: Test failed: Error: Expected but got L".uk" on uri_tests[76]. uri.c:7800: Test failed: Error: Expected google.com.[] but got L"com.[]" on uri_tests[77]. uri.c:8080: Test failed: Error: Expected a length of 13 but got 6 on uri_tests[71].str_props[3]. uri.c:8080: Test failed: Error: Expected a length of 11 but got 4 on uri_tests[73].str_props[3]. uri.c:8078: Test failed: Error: GetPropertyLength returned 0x00000000, expected 0x00000001 on uri_tests[76].str_props[3]. uri.c:8080: Test failed: Error: Expected a length of 0 but got 3 on uri_tests[76].str_props[3]. uri.c:8080: Test failed: Error: Expected a length of 13 but got 6 on uri_tests[77].str_props[3]. uri.c:8147: Test failed: Error: Received flag for property 3 when not expected on uri_tests[76]. uri.c:8197: Test failed: Error: Wasn't expecting to have property 3 on uri_tests[76]. uri.c:10487: Test failed: Error: Expected google.com.uk but got L"com.uk" instead on uri_parse_tests[42]. uri.c:10490: Test failed: Error: Expected 13, but got 6 instead on uri_parse_tests[42]. === w1064 (64 bit uri) === uri.c:7615: Test failed: Expected google.com.uk but got L"com.uk" on uri_tests[71].str_props[3]. uri.c:7615: Test failed: Expected google.uk.1 but got L"uk.1" on uri_tests[73].str_props[3]. uri.c:7613: Test failed: GetPropertyBSTR returned 0x00000000, expected 0x00000001. On uri_tests[76].str_props[3]. uri.c:7615: Test failed: Expected but got L".uk" on uri_tests[76].str_props[3]. uri.c:7615: Test failed: Expected google.com.[] but got L"com.[]" on uri_tests[77].str_props[3]. uri.c:7800: Test failed: Error: Expected google.com.uk but got L"com.uk" on uri_tests[71]. uri.c:7800: Test failed: Error: Expected google.uk.1 but got L"uk.1" on uri_tests[73]. uri.c:7798: Test failed: Error: GetDomain returned 0x00000000, expected 0x00000001 on uri_tests[76]. uri.c:7800: Test failed: Error: Expected but got L".uk" on uri_tests[76]. uri.c:7800: Test failed: Error: Expected google.com.[] but got L"com.[]" on uri_tests[77]. uri.c:8080: Test failed: Error: Expected a length of 13 but got 6 on uri_tests[71].str_props[3]. uri.c:8080: Test failed: Error: Expected a length of 11 but got 4 on uri_tests[73].str_props[3]. uri.c:8078: Test failed: Error: GetPropertyLength returned 0x00000000, expected 0x00000001 on uri_tests[76].str_props[3]. uri.c:8080: Test failed: Error: Expected a length of 0 but got 3 on uri_tests[76].str_props[3]. uri.c:8080: Test failed: Error: Expected a length of 13 but got 6 on uri_tests[77].str_props[3]. uri.c:8147: Test failed: Error: Received flag for property 3 when not expected on uri_tests[76]. uri.c:8197: Test failed: Error: Wasn't expecting to have property 3 on uri_tests[76]. uri.c:10487: Test failed: Error: Expected google.com.uk but got L"com.uk" instead on uri_parse_tests[42]. uri.c:10490: Test failed: Error: Expected 13, but got 6 instead on uri_parse_tests[42].

1 0

Re: msctf/tests: Spelling fixes for inputprocessor ok() messages.
by Marvin 21 Apr '16

21 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22434 Your paranoid android. === w864 (32 bit inputprocessor) === inputprocessor.c:793: Test failed: Deactivation came unexpectedly

1 0

Re: [PATCH 7/8] ddraw: Require exclusive mode only for primary surface flips.
by Marvin 21 Apr '16

21 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22426 Your paranoid android. === w1064 (32 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 6/8] ddraw: Allow DDSCAPS_FLIP without DDSCAPS_PRIMARYSURFACE.
by Marvin 21 Apr '16

21 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22425 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH ] msvcr120/tests: Add critical section test.(try 2)
by Piotr Caban 21 Apr '16

21 Apr '16

Hi, On 04/20/16 16:52, YongHao Hu wrote: > try 2: > Rewrite/improve the test according to Piotr's advice. > > Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com> > --- > dlls/msvcr120/tests/msvcr120.c | 272 > +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 272 insertions(+) > The 64-bit tests are not working on Windows. I didn't look on the patch yet. Thanks, Piotr

1 0

wine 64bit support on mac.
by Diego Vicioso 21 Apr '16

21 Apr '16

Hello. So, I have tested 64bit support on os X. So far, I have encountered one problem, gta iv 64bit refuses to load a command line file I have placed in the gta iv folder. This is only in the 64bit version of wine. In the 32bit version, it works well. I have a linux ubuntu partition partition so I’ll test on that. thanks Sent from my mac

1 0

Re: [PATCH] hidclass.sys: add missing case/missing heapfree (Coverity)
by Aric Stewart 21 Apr '16

21 Apr '16

On 4/20/16 1:16 PM, Marcus Meissner wrote: > 1358558 Resource leak > > (actually switch on the enum, then the compiler will see missing cases) > > Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> > --- > dlls/hidclass.sys/pnp.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c > index d97184f..9ada261 100644 > --- a/dlls/hidclass.sys/pnp.c > +++ b/dlls/hidclass.sys/pnp.c > @@ -295,7 +295,7 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) > ULONG type = irpsp->Parameters.QueryId.IdType; > WCHAR *id = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR)*REGSTR_VAL_MAX_HCID_LEN); > TRACE("IRP_MN_QUERY_ID[%i]\n", type); > - switch (type) > + switch (irpsp->Parameters.QueryId.IdType) > { > case BusQueryHardwareIDs: > case BusQueryCompatibleIDs: > @@ -326,6 +326,10 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) > irp->IoStatus.Information = (ULONG_PTR)id; > rc = STATUS_SUCCESS; > break; > + case BusQueryDeviceSerialNumber: > + FIXME("BusQueryDeviceSerialNumber not implemented\n"); > + HeapFree(GetProcessHeap(), 0, id); > + break; > } > break; > } > If we are switching on the irpsp->Parameters.QueryId.IdType then maybe we should remove the "type" variable all together? It is only used in the TRACE statement then. -aric

1 0

Re: [PATCH] winex11.drv: Use GMEM_FIXED memory for storing clipboard data.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Rafał Harabień <rafalh1992(a)o2.pl> writes: > Tested behavior in Win 10. MSDN says clipboard uses GMEM_SHARED handles but its not true. > Some applications depends on GetClipboardData returning valid pointer to data instead of handle. > Commit fixes pasting from clipboard in Multi Theft Auto: San Andreas. > > Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> > --- > dlls/user32/tests/clipboard.c | 58 ++++++++++++++++++++++++++++++++ > dlls/winex11.drv/clipboard.c | 77 +++++++++++++++++++++++++++++++++---------- > 2 files changed, 117 insertions(+), 18 deletions(-) This breaks the tests: ../../../tools/runtest -q -P wine -T ../../.. -M ole32.dll -p ole32_test.exe.so clipboard && touch clipboard.ok clipboard.c:897: Test failed: got 0x145048 clipboard.c:914: Test failed: got 0x145048 Makefile:184: recipe for target 'clipboard.ok' failed -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/2] gdi32/enhmfdrv: Don't drop viewport/window transformation in StretchBlt
by Huw Davies 21 Apr '16

21 Apr '16

On Wed, Apr 20, 2016 at 06:35:19PM +0200, Piotr Caban wrote: > diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c > index d6d0fe7..ed03c1f 100644 > --- a/dlls/gdi32/enhmfdrv/bitblt.c > +++ b/dlls/gdi32/enhmfdrv/bitblt.c > @@ -122,7 +122,7 @@ BOOL EMFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, > pEMR->dwRop = rop; > pEMR->xSrc = src->log_x; > pEMR->ySrc = src->log_y; > - GetWorldTransform(devSrc->hdc, &pEMR->xformSrc); > + GetTransform(devSrc->hdc, 0x204, &pEMR->xformSrc); > pEMR->crBkColorSrc = GetBkColor(devSrc->hdc); > pEMR->iUsageSrc = DIB_RGB_COLORS; > pEMR->offBmiSrc = emrSize; > This really needs a test, particularly as the docs say it should be the World -> Page transform. I agree, World -> Device makes more sense though. Huw.

1 0

Re: [2/2] shell32/tests: Check if error status is reset after successful file copy
by Marvin 21 Apr '16

21 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22410 Your paranoid android. === wvistau64 (32 bit shlfileop) === shlfileop.c:297: Test failed: SHGetFileInfoA(test4.txt/) should return 1, got 0x0 shlfileop.c:2439: Test failed: SHGetNewLinkInfoA failed, err=0 shlfileop.c:2448: Test failed: SHGetNewLinkInfoA failed, err=0 shlfileop.c:2452: Test failed: does not start with C:\Users\Public\Documents\testdir2 shlfileop.c:2455: Test failed: does not end with .lnk shlfileop.c:83: Test failed: Failure to open file shlfileop.c:2461: Test failed: SHGetNewLinkInfoA failed, err=0 shlfileop.c:2465: Test failed: s does not start with C:\Users\Public\Documents\testdir2 shlfileop.c:2468: Test failed: s does not end with .lnk === wvistau64 (64 bit shlfileop) === shlfileop.c:297: Test failed: SHGetFileInfoA(test4.txt/) should return 1, got 0x0 shlfileop.c:2439: Test failed: SHGetNewLinkInfoA failed, err=1008 shlfileop.c:2448: Test failed: SHGetNewLinkInfoA failed, err=1008 shlfileop.c:2452: Test failed: does not start with C:\Users\Public\Documents\testdir2 shlfileop.c:2455: Test failed: does not end with .lnk shlfileop.c:83: Test failed: Failure to open file shlfileop.c:2461: Test failed: SHGetNewLinkInfoA failed, err=1008 shlfileop.c:2465: Test failed: does not start with C:\Users\Public\Documents\testdir2 shlfileop.c:2468: Test failed: does not end with .lnk shlfileop.c:2470: Test failed: and are the same

2 1

Re: [2/2] shell32/tests: Check if error status is reset after successful file copy
by Marvin 21 Apr '16

21 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22409 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: mmdevapi/tests: Use RegQueryValueExW() for compatibility with Windows XP.
by Andrew Eikum 20 Apr '16

20 Apr '16

mmdevapi doesn't exist on winxp. I'm not opposed to this change, but does it matter? Andrew On Wed, Apr 20, 2016 at 11:52:11AM +0200, Francois Gouget wrote: > RegGetValueW() was added later and should be avoided in the conformance tests. > > Signed-off-by: Francois Gouget <fgouget(a)free.fr> > --- > dlls/mmdevapi/tests/propstore.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c > index 06fe690..665136f 100644 > --- a/dlls/mmdevapi/tests/propstore.c > +++ b/dlls/mmdevapi/tests/propstore.c > @@ -173,7 +173,7 @@ static void test_setvalue_on_wow64(IPropertyStore *store) > > /* Note: the registry key exists even without calling IPropStore::Commit */ > size = sizeof(regval); > - ret = RegGetValueW(props, NULL, bogusW, RRF_RT_DWORD, &type, &regval, &size); > + ret = RegQueryValueExW(props, bogusW, NULL, &type, (LPBYTE)&regval, &size); > ok(ret == ERROR_SUCCESS, "Couldn't get bogus propertykey value: %u\n", ret); > ok(type == REG_DWORD, "Got wrong value type: %u\n", type); > ok(regval == 0xAB, "Got wrong value: 0x%x\n", regval); > -- > 2.8.0.rc3 > >

2 2

Re: [PATCH 4/7] wined3d: Allocate system memory for complete textures.
by Marvin 20 Apr '16

20 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22399 Your paranoid android. === w864 (64 bit device) === device.c:4317: Test failed: cw is 0xf60, expected 0x7f. device.c:4326: Test failed: Callback cw is 0xf60, expected 0x7f. === w1064 (64 bit device) === device.c:4317: Test failed: cw is 0xf60, expected 0x7f. device.c:4326: Test failed: Callback cw is 0xf60, expected 0x7f.

1 0

Re: [PATCH 4/7] wined3d: Allocate system memory for complete textures.
by Marvin 20 Apr '16

20 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22398 Your paranoid android. === w8 (32 bit device) === device.c:1372: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1417: Test failed: Reset failed, hr 0x88760868. device.c:1419: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1423: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1430: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1431: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1432: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1433: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1434: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1435: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1440: Test failed: Screen width is 640, expected 800. device.c:1441: Test failed: Screen height is 480, expected 600. device.c:1447: Test failed: Back buffer width is 640, expected 800. device.c:1449: Test failed: Back buffer height is 480, expected 600. device.c:1479: Test failed: Screen width is 640, expected 1024. device.c:1480: Test failed: Screen height is 480, expected 768. device.c:2725: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2730: Test failed: The focus window is active. device.c:2738: Test failed: Got unexpected hr 0x88760869. device.c:2742: Test failed: Got unexpect screen size 800x600. device.c:2757: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2766: Test failed: Got unexpect screen size 800x600. device.c:2779: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2787: Test failed: Got unexpect width 640. device.c:2788: Test failed: Got unexpect height 480. === w864 (32 bit device) === device.c:1372: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1417: Test failed: Reset failed, hr 0x88760868. device.c:1419: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1423: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1430: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1431: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1432: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1433: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1434: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1435: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1440: Test failed: Screen width is 640, expected 800. device.c:1441: Test failed: Screen height is 480, expected 600. device.c:1447: Test failed: Back buffer width is 640, expected 800. device.c:1449: Test failed: Back buffer height is 480, expected 600. device.c:1479: Test failed: Screen width is 640, expected 1024. device.c:1480: Test failed: Screen height is 480, expected 768. device.c:2725: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2730: Test failed: The focus window is active. device.c:2738: Test failed: Got unexpected hr 0x88760869. device.c:2742: Test failed: Got unexpect screen size 800x600. device.c:2757: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2766: Test failed: Got unexpect screen size 800x600. device.c:2779: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2787: Test failed: Got unexpect width 640. device.c:2788: Test failed: Got unexpect height 480.

1 0

Re: [PATCH v2 1/8] wined3d: Alpha test emulation for core profile contexts.
by Henri Verbeet 20 Apr '16

20 Apr '16

On 19 April 2016 at 18:56, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + /* alpha_func is the PASS condition, not the DISCARD condition. Instead of > + * flipping all the operators here, just negate the comparison below. */ As an aside, note that in general inverting operators isn't safe if there are potential NaNs involved. > + static const char *comparison_operator[] = > + { > + "", /* WINED3D_CMP_NEVER */ > + "<", /* WINED3D_CMP_LESS */ > + "==", /* WINED3D_CMP_EQUAL */ > + "<=", /* WINED3D_CMP_LESSEQUAL */ > + ">", /* WINED3D_CMP_GREATER */ > + "!=", /* WINED3D_CMP_NOTEQUAL */ > + ">=", /* WINED3D_CMP_GREATEREQUAL */ > + "" /* WINED3D_CMP_ALWAYS */ > + }; I should have noticed the first time, but I think you'll want to make the string pointers const as well. > @@ -3091,6 +3091,13 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 > args->pointsprite = state->render_states[WINED3D_RS_POINTSPRITEENABLE] > && state->gl_primitive_type == GL_POINTS; > > + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) > + args->alpha_test_func = WINED3D_CMP_ALWAYS - 1; > + else > + args->alpha_test_func = (state->render_states[WINED3D_RS_ALPHATESTENABLE] > + ? wined3d_sanitize_cmp_func(state->render_states[WINED3D_RS_ALPHAFUNC]) > + : WINED3D_CMP_ALWAYS) - 1; For what it's worth, what I originally had in mind was mapping WINED3D_CMP_ALWAYS to 0. I.e., masking with 7. This works as well.

2 2

Re: [PATCH 5/8] wined3d: Fixup vertex position in geometry shaders.
by Henri Verbeet 20 Apr '16

20 Apr '16

Do we need this if we have GLSL 1.50 / ARB_fragment_coord_conventions?

2 1

Re: [PATCH 3/8] wined3d: Simplify shader interface matching for SM4+ vertex shaders.
by Henri Verbeet 20 Apr '16

20 Apr '16

On 19 April 2016 at 18:56, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > After some testing it looks like, with SM4+ on Windows: > 1. Output registers have to match with input registers from the > following shader stage (register index and mask). There is no "smart" > matching of semantics like in SM3. > 2. Using uninitialized varyings in SM4+ shaders doesn't give consistent > results. > That means we can simplify the relevant code quite a bit. Applications > shouldn't be able to depend on particular values for uninitialized > varyings so we can avoid explicitly initializing them. > Does that mean we don't need the separate "reorder" shader between the stages? (Even more so if we have separate shader objects.) On 19 April 2016 at 18:56, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > -static void shader_glsl_setup_shader_output(struct shader_glsl_priv *priv, > +static void shader_glsl_setup_vs3_output(struct shader_glsl_priv *priv, > const struct wined3d_gl_info *gl_info, const DWORD *map, > const struct wined3d_shader_signature *input_signature, > const struct wined3d_shader_reg_maps *reg_maps_in, > const struct wined3d_shader_signature *output_signature, > - const struct wined3d_shader_reg_maps *reg_maps_out, const char *out_array_name) > + const struct wined3d_shader_reg_maps *reg_maps_out) > { > struct wined3d_string_buffer *destination = string_buffer_get(&priv->string_buffers); > BOOL legacy_context = gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]; > @@ -5191,7 +5191,7 @@ static void shader_glsl_setup_shader_output(struct shader_glsl_priv *priv, > else if (in_idx == in_count + 1) > string_buffer_sprintf(destination, "gl_FrontSecondaryColor"); > else > - string_buffer_sprintf(destination, "%s[%u]", out_array_name, in_idx); > + string_buffer_sprintf(destination, "%s[%u]", "ps_link", in_idx); > > if (!set[in_idx]) > set[in_idx] = ~0u; > @@ -5243,7 +5243,7 @@ static void shader_glsl_setup_shader_output(struct shader_glsl_priv *priv, > else if (i == in_count + 1) > string_buffer_sprintf(destination, "gl_FrontSecondaryColor"); > else > - string_buffer_sprintf(destination, "%s[%u]", out_array_name, i); > + string_buffer_sprintf(destination, "%s[%u]", "ps_link", i); > > if (size == 1) > shader_addline(buffer, "%s.%s = 0.0;\n", destination->buffer, reg_mask); This looks like you should have just kept it the way it was in the previous patch.

2 1

Re: [PATCH 8/8] d3d11/tests: Add a geometry shader test.
by Józef Kucia 20 Apr '16

20 Apr '16

On Tue, Apr 19, 2016 at 6:56 PM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > dlls/d3d11/tests/d3d11.c | 232 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 232 insertions(+) > > diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c > index 713c9cf..0fafaaf 100644 > --- a/dlls/d3d11/tests/d3d11.c > +++ b/dlls/d3d11/tests/d3d11.c > @@ -6569,6 +6569,237 @@ static void test_getdc(void) > ok(!refcount, "Device has %u references left.\n", refcount); > } > > +static void test_geometry_shader(void) > +{ > + static const struct > + { > + struct vec4 position; > + unsigned int color; > + } > + vertex[] = > + { > + {{0.0f, 0.0f, 1.0f, 1.0f}, 0xffffff00}, > + }; > + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = > + { > + {"SV_POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, > + {"COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 16, D3D10_INPUT_PER_VERTEX_DATA, 0}, It would be better to use D3D11 constants. > + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_10_0; Why should we limit this test to feature level 10_0? > + buffer_desc.ByteWidth = sizeof(vertex); > + buffer_desc.Usage = D3D11_USAGE_DEFAULT; > + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; > + buffer_desc.CPUAccessFlags = 0; > + buffer_desc.MiscFlags = 0; The "StructureByteStride" field is uninitialized. I suppose it doesn't matter in practice because this field is used only for structured buffers.

2 1

Re: [PATCH ] msvcr120/tests: Add critical section test.(try 2)
by Marvin 20 Apr '16

20 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22393 Your paranoid android. === w2008s64 (64 bit msvcr120) === Found no trace of the test summary line or of a crash

1 0

Re: [PATCH 1/2] d3drm: Implement IDirect3DRM*::CreateObject (v2).
by Henri Verbeet 20 Apr '16

20 Apr '16

On 18 April 2016 at 19:00, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index a8f9c40..2b0174d 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -1269,7 +1269,8 @@ static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID > context.test_idx = test_idx; > context.obj = obj; > > - hr = IDirect3DRMObject_AddDestroyCallback(obj, NULL, &context); > + if ((hr = IDirect3DRMObject_AddDestroyCallback(obj, NULL, &context)) != D3DRMERR_BADVALUE) > + return; I don't think we want that. Doing this means we won't notice when the function starts returning the wrong value, and the following tests get effectively disabled too in that case. > + hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_DirectDraw, NULL, &IID_IDirectDraw, (void **)&unknown); > + ok(hr == CLASSFACTORY_E_FIRST, "Expected hr == CLASSFACTORY_E_FIRST, got %#x.\n", hr); > + ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown); It would be better to initialise "unknown" with some known value before calling CreateObject(). Like this, if CreateObject() doesn't touch the value, the test may randomly pass or fail depending on what the initial value of "unknown" ends up being.

2 3

Re: [PATCH] comctl32/tooltips: Protect TTM_ADDTOOLW from invalid text pointers
by Marvin 20 Apr '16

20 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22377 Your paranoid android. === wxppro (32 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w2003std (32 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === wvistau64 (32 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w2008s64 (32 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w7u (32 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w7pro64 (32 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w8 (32 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w864 (32 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w1064 (32 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === wvistau64 (64 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w2008s64 (64 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w7pro64 (64 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w864 (64 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed! === w1064 (64 bit tooltips) === tooltips.c:471: Test failed: Adding the tool to the tooltip failed!

2 1

Re: [PATCH v3 2/8] wined3d: Implement readback from 2D array textures using glGet[Compressed]TexImage().
by Henri Verbeet 20 Apr '16

20 Apr '16

On 20 April 2016 at 11:42, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -874,7 +879,31 @@ static void surface_download_data(struct wined3d_surface *surface, const struct > return; > } > > - wined3d_texture_get_memory(texture, surface_get_sub_resource_idx(surface), &data, dst_location); > + sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx); Actually, don't use wined3d_texture_get_sub_resource() if you know the index is valid. It does extra validation that's only useful when the index comes from outside of wined3d. > + wined3d_texture_bind_and_dirtify(texture, context, !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); This is an unrelated change. In itself it's probably fine to make surface_download_data() bind the texture, but if you do that it becomes inconsistent with surface_upload_data(), wined3d_volume_download_data() and wined3d_volume_upload_data().

1 0

Re: [PATCH 05/10] wined3d: Try to avoid glGetTexImage() for 2D array textures.
by Henri Verbeet 20 Apr '16

20 Apr '16

On 19 April 2016 at 00:01, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > It's inefficient to download a complete miplevel to copy just a single layer from it. > --- Does this happen much in practice? Do you have performance numbers? The patch doesn't really make sense in its current form. surface_download_data() is meant for downloading the data from the texture. If that's not what you want, don't call it. (Also, does this actually work? It looks like it's just reading from the current drawable.)

2 4

Re: [3/3] services: Track services and processes separately.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Sebastian Lackner <sebastian(a)fds-team.de> writes: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > programs/services/rpc.c | 37 ++++--- > programs/services/services.c | 199 ++++++++++++++++++++++++++----------------- > programs/services/services.h | 4 > 3 files changed, 147 insertions(+), 93 deletions(-) It breaks the tests: ../../../tools/runtest -q -P wine -T ../../.. -M taskschd.dll -p taskschd_test.exe.so scheduler && touch scheduler.ok scheduler.c:78: Test failed: Connect error 0x80041315 scheduler.c:101: Test failed: Connect error 0x80041315 scheduler.c:151: Test failed: Connect error 0x80041315 scheduler.c:162: Test failed: GetFolder error 0x800704e3 wine: Unhandled page fault on read access to 0x00000000 at address 0x7eff3a5e (thread 0009), starting debugger... -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 1/5] dwrite/tests: Added GetFontSignature() test (resend)
by Sebastian Lackner 20 Apr '16

20 Apr '16

On 19.04.2016 19:10, Nikolay Sivov wrote: > + ok(fontsig.fsUsb[3] == expected_signature.fsUsb[3], "%s: fsUsb[3] %#x, expected %#x\n", wine_dbgstr_w(nameW), > + fontsig.fsUsb[0], expected_signature.fsUsb[3]); ^^^ There is a small typo here.

2 1

Re: msi/tests: Spelling fixes for some action and package ok() messages.
by Marvin 20 Apr '16

20 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22354 Your paranoid android. === wvistau64 (32 bit action) === The test timed out

1 0

Re: [PATCH 2/5] dwrite/tests: Some basic tests for fontface references
by Sebastian Lackner 20 Apr '16

20 Apr '16

On 19.04.2016 19:10, Nikolay Sivov wrote: > + hr = IDWriteFactory3_CreateFontFaceReference_(factory3, file, 0, DWRITE_FONT_SIMULATIONS_NONE, &ref); > + ok(hr == S_OK, "got 0x%08x\n", hr); > + > + hr = IDWriteFontFaceReference_GetFontFile(ref, &file1); > + ok(hr == S_OK, "got 0x%08x\n", hr); > + ok(file != file1, "got %p, previous file %p\n", file1, file); Also not really critical, but you might be leaking a reference to "ref" here. > + > + IDWriteFontFile_Release(file); > + IDWriteFontFile_Release(file1); > +} > IDWriteFactory3_Release(factory3); > DELETE_FONTFILE(path); > }

1 0

Re: taskschd/tests: Fix a use-after-free in scheduler tests.
by Marvin 19 Apr '16

19 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22349 Your paranoid android. === w1064 (32 bit scheduler) === scheduler.c:159: Test failed: expected ERROR_INVALID_NAME, got 0x80070002 scheduler.c:204: Test failed: expected ERROR_PATH_NOT_FOUND, got 0x80070002 scheduler.c:354: Test failed: expected ERROR_FILE_NOT_FOUND, got 0 scheduler.c:767: Test failed: expected ERROR_PATH_NOT_FOUND, got 0x80070002 scheduler.c:773: Test failed: expected ERROR_PATH_NOT_FOUND, got 0x80070002 scheduler.c:941: Test failed: expected ERROR_FILE_NOT_FOUND, got 0 === w1064 (64 bit scheduler) === scheduler.c:159: Test failed: expected ERROR_INVALID_NAME, got 0x80070002 scheduler.c:204: Test failed: expected ERROR_PATH_NOT_FOUND, got 0x80070002 scheduler.c:354: Test failed: expected ERROR_FILE_NOT_FOUND, got 0 scheduler.c:767: Test failed: expected ERROR_PATH_NOT_FOUND, got 0x80070002 scheduler.c:773: Test failed: expected ERROR_PATH_NOT_FOUND, got 0x80070002 scheduler.c:941: Test failed: expected ERROR_FILE_NOT_FOUND, got 0

2 1

Re: [3/3] user32: Send WM_CTLCOLOR* message only for visible buttons.
by Marvin 19 Apr '16

19 Apr '16

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 https://testbot.winehq.org/JobDetails.pl?Key=22346 Your paranoid android. === w864 (32 bit msg) === msg.c:6482: Test failed: Update region shouldn't be empty msg.c:6716: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6718: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different === w1064 (32 bit msg) === msg.c:6482: Test failed: Update region shouldn't be empty msg.c:6716: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6718: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:6482: Test failed: Update region shouldn't be empty msg.c:6716: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6718: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different

2 1

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-devel