June 2010 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll/tests: Fix some exception tests for Wow64.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: 0fdcab06ac5872637e57f2c5b6e1bf61ddf573c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fdcab06ac5872637e57f2c5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 22 13:51:18 2010 +0200 ntdll/tests: Fix some exception tests for Wow64. --- dlls/ntdll/tests/exception.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 154a7c7..598544e 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -143,9 +143,9 @@ static const struct exception /* 20 */ /* test overlong instruction (limit is 15 bytes, 5 on Win7) */ { { 0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0xfa,0xc3 }, - 0, 16, FALSE, STATUS_ILLEGAL_INSTRUCTION, 0 }, + 0, 16, TRUE, STATUS_ILLEGAL_INSTRUCTION, 0 }, { { 0x64,0x64,0x64,0x64,0xfa,0xc3 }, - 0, 5, FALSE, STATUS_PRIVILEGED_INSTRUCTION, 0 }, + 0, 5, TRUE, STATUS_PRIVILEGED_INSTRUCTION, 0 }, /* test invalid interrupt */ { { 0xcd, 0xff, 0xc3 }, /* 21: int $0xff; ret */ @@ -246,7 +246,9 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce rec->ExceptionAddress, (char *)code_mem + 0xb); if (pNtCurrentTeb()->Peb->BeingDebugged) - ok((void *)context->Eax == pRtlRaiseException, "debugger managed to modify Eax to %x should be %p\n", + ok((void *)context->Eax == pRtlRaiseException || + broken( is_wow64 && context->Eax == 0xf00f00f1 ), /* broken on vista */ + "debugger managed to modify Eax to %x should be %p\n", context->Eax, pRtlRaiseException); /* check that context.Eip is fixed up only for EXCEPTION_BREAKPOINT @@ -773,7 +775,9 @@ static void test_debugger(void) /* ctx.Eip is the same value the exception handler got */ if (de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT) { - ok((char *)ctx.Eip == (char *)code_mem_address + 0xa, "Eip at 0x%x instead of %p\n", + ok((char *)ctx.Eip == (char *)code_mem_address + 0xa || + broken(is_wow64 && (char *)ctx.Eip == (char *)code_mem_address + 0xb), + "Eip at 0x%x instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xa); /* need to fixup Eip for debuggee */ if ((char *)ctx.Eip == (char *)code_mem_address + 0xa) @@ -824,7 +828,8 @@ static DWORD simd_fault_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_R ok( rec->ExceptionCode == STATUS_FLOAT_MULTIPLE_TRAPS, "exception code: %#x, should be %#x\n", rec->ExceptionCode, STATUS_FLOAT_MULTIPLE_TRAPS); - ok( rec->NumberParameters == 1, "# of params: %i, should be 1\n", + ok( rec->NumberParameters == 1 || broken(is_wow64 && rec->NumberParameters == 2), + "# of params: %i, should be 1\n", rec->NumberParameters); if( rec->NumberParameters == 1 ) ok( rec->ExceptionInformation[0] == 0, "param #1: %lx, should be 0\n", rec->ExceptionInformation[0]);

1 0

Piotr Caban : msvcrt: Added __crtLCMapStringW partial implementation.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: c0637edda20fe5206db534fd50e783996a4ad463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0637edda20fe5206db534fd5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 22 12:26:23 2010 +0200 msvcrt: Added __crtLCMapStringW partial implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/locale.c | 12 ++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 7 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0d05c28..99730e5 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -344,7 +344,7 @@ @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA -@ stub __crtLCMapStringW +@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ stub __daylight @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 7c84705..97783fb 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -110,7 +110,7 @@ @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA -@ stub __crtLCMapStringW +@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno @ cdecl __fpecode() msvcrt.__fpecode diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 8599efa..dfa04f8 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -105,7 +105,7 @@ @ cdecl __crtGetLocaleInfoW(long long ptr long) @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA -@ stub __crtLCMapStringW +@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno @ cdecl __fpecode() msvcrt.__fpecode diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b4c168a..8f3769e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -150,7 +150,7 @@ @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA -@ stub __crtLCMapStringW +@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ stub __daylight @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a2bed36..e00a331 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -147,7 +147,7 @@ @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA -@ stub __crtLCMapStringW +@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ stub __daylight @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 5a27de0..393a23d 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -466,6 +466,18 @@ int CDECL __crtLCMapStringA( } /********************************************************************* + * __crtLCMapStringW (MSVCRT.@) + */ +int CDECL __crtLCMapStringW(LCID lcid, DWORD mapflags, const MSVCRT_wchar_t *src, + int srclen, MSVCRT_wchar_t *dst, int dstlen, unsigned int codepage, int xflag) +{ + FIXME("(lcid %x, flags %x, %s(%d), %p(%d), %x, %d), partial stub!\n", + lcid, mapflags, debugstr_w(src), srclen, dst, dstlen, codepage, xflag); + + return LCMapStringW(lcid, mapflags, src, srclen, dst, dstlen); +} + +/********************************************************************* * __crtCompareStringA (MSVCRT.@) */ int CDECL __crtCompareStringA( LCID lcid, DWORD flags, const char *src1, int len1, diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index bba06d6..e39253e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -140,7 +140,7 @@ @ cdecl __crtGetLocaleInfoW(long long ptr long) @ cdecl __crtGetStringTypeW(long long wstr long ptr) @ cdecl __crtLCMapStringA(long long str long ptr long long long) -# stub __crtLCMapStringW +@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) # stub __daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno

1 0

Henri Verbeet : wined3d: read_from_framebuffer_texture() isn' t suitable for readback of onscreen surfaces.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: b769c912cc457cc4de2bfbb739c3284de1668320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b769c912cc457cc4de2bfbb73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 22 12:49:07 2010 +0200 wined3d: read_from_framebuffer_texture() isn't suitable for readback of onscreen surfaces. --- dlls/wined3d/surface.c | 58 +++++++++++++++--------------------------------- 1 files changed, 18 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 73c5aff..08835a8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1495,6 +1495,15 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) struct wined3d_context *context; GLint prevRead; + if (!surface_is_offscreen(This)) + { + /* We would need to flip onscreen surfaces, but there's no efficient + * way to do that here. It makes more sense for the caller to + * explicitly go through sysmem. */ + ERR("Not supported for onscreen targets.\n"); + return; + } + /* Activate the surface to read from. In some situations it isn't the currently active target(e.g. backbuffer * locking during offscreen rendering). RESOURCELOAD is ok because glCopyTexSubImage2D isn't affected by any * states in the stateblock, and no driver was found yet that had bugs in that regard. @@ -1505,42 +1514,13 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) surface_prepare_texture(This, gl_info, srgb); surface_bind_and_dirtify(This, srgb); - ENTER_GL(); - glGetIntegerv(GL_READ_BUFFER, &prevRead); - LEAVE_GL(); - - /* Select the correct read buffer, and give some debug output. - * There is no need to keep track of the current read buffer or reset it, every part of the code - * that reads sets the read buffer as desired. - */ - if (!surface_is_offscreen(This)) - { - GLenum buffer = surface_get_gl_buffer(This); - TRACE("Locking %#x buffer\n", buffer); - - ENTER_GL(); - glReadBuffer(buffer); - checkGLcall("glReadBuffer"); - LEAVE_GL(); - } - else - { - /* Locking the primary render target which is not on a swapchain(=offscreen render target). - * Read from the back buffer - */ - TRACE("Locking offscreen render target\n"); - ENTER_GL(); - glReadBuffer(device->offscreenBuffer); - checkGLcall("glReadBuffer"); - LEAVE_GL(); - } + TRACE("Reading back offscreen render target %p.\n", This); ENTER_GL(); - /* If !SrcIsUpsideDown we should flip the surface. - * This can be done using glCopyTexSubImage2D but this - * is VERY slow, so don't do that. We should prevent - * this code from getting called in such cases or perhaps - * we can use FBOs */ + + glGetIntegerv(GL_READ_BUFFER, &prevRead); + glReadBuffer(device->offscreenBuffer); + checkGLcall("glReadBuffer"); glCopyTexSubImage2D(This->texture_target, This->texture_level, 0, 0, 0, 0, This->currentDesc.Width, This->currentDesc.Height); @@ -1552,8 +1532,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) LEAVE_GL(); context_release(context); - - TRACE("Updated target %d\n", This->texture_target); } /* Context activation is done by the caller. */ @@ -4239,11 +4217,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; IWineD3DDeviceImpl *device = This->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + BOOL drawable_read_ok = surface_is_offscreen(This); struct wined3d_format_desc desc; CONVERT_TYPES convert; int width, pitch, outpitch; BYTE *mem; - BOOL drawable_read_ok = TRUE; BOOL in_fbo = FALSE; if (This->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) @@ -4402,9 +4380,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D IWineD3DSurfaceImpl_LoadLocation(iface, SFLAG_INSYSMEM, rect); } } - if(!(This->Flags & SFLAG_INSYSMEM)) { - /* Should not happen */ - ERR("Trying to load a texture from sysmem, but SFLAG_INSYSMEM is not set\n"); + if (!(This->Flags & SFLAG_INSYSMEM)) + { + WARN("Trying to load a texture from sysmem, but SFLAG_INSYSMEM is not set.\n"); /* Lets hope we get it from somewhere... */ IWineD3DSurfaceImpl_LoadLocation(iface, SFLAG_INSYSMEM, rect); }

1 0

Alexandre Julliard : kernel32: Add the TlsAlloc/FreeInternal entry points.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: 79b6351c9c886e563a0ac6c6575bb0203f4c24c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79b6351c9c886e563a0ac6c65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 22 16:58:02 2010 +0200 kernel32: Add the TlsAlloc/FreeInternal entry points. --- dlls/kernel32/kernel32.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f08e752..dbcb179 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1095,9 +1095,9 @@ @ stdcall Thread32Next(long ptr) @ stdcall -i386 -private ThunkConnect32(ptr str str str ptr ptr) krnl386.exe16.ThunkConnect32 @ stdcall TlsAlloc() -@ stub TlsAllocInternal +@ stdcall TlsAllocInternal() TlsAlloc @ stdcall TlsFree(long) -@ stub TlsFreeInternal +@ stdcall TlsFreeInternal(long) TlsFree @ stdcall TlsGetValue(long) @ stdcall TlsSetValue(long ptr) @ stdcall Toolhelp32ReadProcessMemory(long ptr ptr long ptr)

1 0

Nikolay Sivov : msxml3: Use vtable macros consistently, depending on pointer type.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: 302fb5f15a7079860d3f2386b4239ae6a25c896c URL: http://source.winehq.org/git/wine.git/?a=commit;h=302fb5f15a7079860d3f2386b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 22 16:14:51 2010 +0400 msxml3: Use vtable macros consistently, depending on pointer type. --- dlls/msxml3/domdoc.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 688ce99..54e4728 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1060,7 +1060,7 @@ static HRESULT WINAPI domdoc_createElement( V_VT(&type) = VT_I1; V_I1(&type) = NODE_ELEMENT; - hr = IXMLDOMDocument_createNode(iface, type, tagname, NULL, &node); + hr = IXMLDOMDocument2_createNode(iface, type, tagname, NULL, &node); if (hr == S_OK) { IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)element); @@ -1089,7 +1089,7 @@ static HRESULT WINAPI domdoc_createDocumentFragment( V_VT(&type) = VT_I1; V_I1(&type) = NODE_DOCUMENT_FRAGMENT; - hr = IXMLDOMDocument_createNode(iface, type, NULL, NULL, &node); + hr = IXMLDOMDocument2_createNode(iface, type, NULL, NULL, &node); if (hr == S_OK) { IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMDocumentFragment, (void**)frag); @@ -1249,7 +1249,7 @@ static HRESULT WINAPI domdoc_createAttribute( V_VT(&type) = VT_I1; V_I1(&type) = NODE_ATTRIBUTE; - hr = IXMLDOMDocument_createNode(iface, type, name, NULL, &node); + hr = IXMLDOMDocument2_createNode(iface, type, name, NULL, &node); if (hr == S_OK) { IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMAttribute, (void**)attribute); @@ -1747,23 +1747,23 @@ static HRESULT WINAPI domdoc_save( if(V_VT(&destination) == VT_UNKNOWN) { IUnknown *pUnk = V_UNKNOWN(&destination); - IXMLDOMDocument *pDocument; + IXMLDOMDocument2 *pDocument; - ret = IXMLDOMDocument_QueryInterface(pUnk, &IID_IXMLDOMDocument2, (void**)&pDocument); + ret = IUnknown_QueryInterface(pUnk, &IID_IXMLDOMDocument2, (void**)&pDocument); if(ret == S_OK) { BSTR bXML; VARIANT_BOOL bSuccessful; - ret = IXMLDOMDocument_get_xml(iface, &bXML); + ret = IXMLDOMDocument2_get_xml(iface, &bXML); if(ret == S_OK) { - ret = IXMLDOMDocument_loadXML(pDocument, bXML, &bSuccessful); + ret = IXMLDOMDocument2_loadXML(pDocument, bXML, &bSuccessful); SysFreeString(bXML); } - IXMLDOMDocument_Release(pDocument); + IXMLDOMDocument2_Release(pDocument); } TRACE("ret %d\n", ret);

1 0

Aric Stewart : winex11.drv: Make UploadGlyph fallback to notdef and space so as to not fail.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: 802c4dee5793d8ee13f9ae6fbb9eab4190c45f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=802c4dee5793d8ee13f9ae6fb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 22 21:50:21 2010 +0900 winex11.drv: Make UploadGlyph fallback to notdef and space so as to not fail. --- dlls/winex11.drv/xrender.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 810b163..2fc804a 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1205,7 +1205,7 @@ void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev) * * Helper to ExtTextOut. Must be called inside xrender_cs */ -static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) +static void UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) { unsigned int buflen; char *buf; @@ -1252,8 +1252,16 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) buflen = GetGlyphOutlineW(physDev->hdc, glyph, ggo_format, &gm, 0, NULL, &identity); } if(buflen == GDI_ERROR) { - WARN("GetGlyphOutlineW failed\n"); - return FALSE; + WARN("GetGlyphOutlineW failed using default glyph\n"); + buflen = GetGlyphOutlineW(physDev->hdc, 0, ggo_format, &gm, 0, NULL, &identity); + if(buflen == GDI_ERROR) { + WARN("GetGlyphOutlineW failed for default glyph trying for space\n"); + buflen = GetGlyphOutlineW(physDev->hdc, 0x20, ggo_format, &gm, 0, NULL, &identity); + if(buflen == GDI_ERROR) { + ERR("GetGlyphOutlineW for all attempts unable to upload a glyph\n"); + return; + } + } } TRACE("Turning off antialiasing for this monochrome font\n"); } @@ -1423,8 +1431,6 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) } formatEntry->gis[glyph] = gi; - - return TRUE; } static void SharpGlyphMono(X11DRV_PDEVICE *physDev, INT x, INT y,

1 0

Alexandre Julliard : ntdll: Fix the initial FPU control word on 32-bit too.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: 0db65fd36ee8399e08635eec8a038919e3b029bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0db65fd36ee8399e08635eec8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 22 11:19:02 2010 +0200 ntdll: Fix the initial FPU control word on 32-bit too. --- dlls/kernel32/tests/thread.c | 7 ++++--- dlls/ntdll/signal_i386.c | 9 +++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 1d3931f..3da29a2 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1329,6 +1329,8 @@ static void test_ThreadErrorMode(void) pSetThreadErrorMode(oldmode, NULL); } +void _fpreset(void) {} /* override the mingw fpu init code */ + static inline void set_fpu_cw(WORD cw) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) @@ -1387,11 +1389,10 @@ static WORD get_thread_fpu_cw(void) static void test_thread_fpu_cw(void) { - WORD initial_cw, cw, expect; + WORD initial_cw, cw; initial_cw = get_fpu_cw(); - expect = sizeof(void *) > sizeof(int) ? 0x27f : 0x37f; - ok(initial_cw == expect, "Expected FPU control word expect, got %#x.\n", initial_cw); + ok(initial_cw == 0x27f, "Expected FPU control word 0x27f, got %#x.\n", initial_cw); cw = get_thread_fpu_cw(); ok(cw == 0x27f, "Expected FPU control word 0x27f, got %#x.\n", cw); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index b003436..c08693e 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2155,6 +2155,7 @@ void signal_free_thread( TEB *teb ) */ void signal_init_thread( TEB *teb ) { + const WORD fpu_cw = 0x27f; struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)teb->SpareBytes1; LDT_ENTRY fs_entry; stack_t ss; @@ -2178,15 +2179,11 @@ void signal_init_thread( TEB *teb ) wine_ldt_init_fs( thread_data->fs, &fs_entry ); thread_data->gs = wine_get_gs(); - if (teb->Peb->ProcessHeap) /* Not for the inital thread. */ - { - const WORD fpu_cw = 0x27f; #ifdef __GNUC__ - __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw)); + __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw)); #else - FIXME("FPU setup not implemented for this platform.\n"); + FIXME("FPU setup not implemented for this platform.\n"); #endif - } } /**********************************************************************

1 0

Aurimas Fišeras : cmd: Update Lithuanian translation.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: e554c4575f4858b4f6f06a5e52aaa22ff987704a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e554c4575f4858b4f6f06a5e5… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Jun 21 19:23:46 2010 +0300 cmd: Update Lithuanian translation. --- programs/cmd/Lt.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/Lt.rc b/programs/cmd/Lt.rc index d3eccb9..9f5ca81 100644 --- a/programs/cmd/Lt.rc +++ b/programs/cmd/Lt.rc @@ -113,8 +113,8 @@ MOVE nepavyksta jei sena ir nauja vietos yra su skirtingomis DOS raidėmis.\n" WCMD_PATH, "PATH parodo ar pakeičia paieškos kelią.\n\ \n\ -Įvedus PATH bus parodyta dabartinė PATH reikšmė (iš pradžių tai reikšmė\n\ -nurodyta jūsų wine.conf faile). Norėdami pakeisti nuostatą nurodykite PATH\n\ +Įvedus PATH bus parodyta dabartinė PATH reikšmė (iš pradžių reikšmė\n\ +paimama iš registro). Norėdami pakeisti nuostatą nurodykite PATH\n\ komandai naują reikšmę kaip parametrą.\n\ \n\ PATH modifikuoti taip pat galima naudojant PATH aplinkos kintamąjį,\n\

1 0

Frédéric Delanoy : cmd: Update French translation .
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: 2030b8c0c84bb66a3eebe8504c0d0f17823cafc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2030b8c0c84bb66a3eebe8504… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jun 21 19:23:56 2010 +0200 cmd: Update French translation. --- programs/cmd/Fr.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/Fr.rc b/programs/cmd/Fr.rc index 6ee1e1d..ba86eed 100644 --- a/programs/cmd/Fr.rc +++ b/programs/cmd/Fr.rc @@ -114,8 +114,8 @@ MOVE échoue si l'ancien et le nouvel emplacement sont sur des lecteurs DOS diff WCMD_PATH, "PATH affiche ou change le chemin de recherche de cmd.\n\ \n\ -Entrer PATH seul affiche le réglage courant de PATH (initialement\n\ -c'est la valeur donnée dans le fichier wine.conf). Pour changer\n\ +Entrer PATH seul affiche le réglage courant de PATH (dont la valeur\n\ +initiale provient de la base de registre). Pour changer\n\ le réglage, faites suivre la commande PATH par la nouvelle valeur.\n\ Il est aussi possible de modifier le PATH en utilisant la variable\n\ d'environnement PATH, par exemple :\n\

1 0

Sven Baars : cmd: Update Dutch translation.
by Alexandre Julliard 22 Jun '10

22 Jun '10

Module: wine Branch: master Commit: 1f8225c99d7ea66ffddea0a6aa1b21b5da438041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8225c99d7ea66ffddea0a6a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon Jun 21 21:50:10 2010 +0200 cmd: Update Dutch translation. --- programs/cmd/Nl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/Nl.rc b/programs/cmd/Nl.rc index 79a14e4..ab6c10d 100644 --- a/programs/cmd/Nl.rc +++ b/programs/cmd/Nl.rc @@ -120,8 +120,8 @@ DOS-schijven bevinden.\n" WCMD_PATH, "PATH toon of wijzigt het zoekpad van cmd.\n\ \n\ -De opdracht PATH toont het huidige zoekpad (de beginwaarde wordt in\n\ -het bestand genaamd wine.conf toegekend). Om het zoekpad te wijzigen laat\n\ +De opdracht PATH toont het huidige zoekpad (de beginwaarde wordt uit\n\ +het register gehaald). Om het zoekpad te wijzigen laat\n\ u de PATH opdracht volgen door de nieuwe waarde.\n\ \n\ Het is ook mogelijk om het zoekpad te wijzigen met behulp van de PATH\n\

1 0