March 2015 - Wine-Commits - list.winehq.org

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetTextRenderingParams().
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: 845103c7ddb65a9e0baa24be8b12840835bc213e URL: http://source.winehq.org/git/wine.git/?a=commit;h=845103c7ddb65a9e0baa24be8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 09:41:18 2015 +0100 d2d1: Implement d2d_d3d_render_target_GetTextRenderingParams(). --- dlls/d2d1/render_target.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 8eccc25..80f9fea 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -872,9 +872,12 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextRenderingParams(ID2D1 static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTextRenderingParams(ID2D1RenderTarget *iface, IDWriteRenderingParams **text_rendering_params) { - FIXME("iface %p, text_rendering_params %p stub!\n", iface, text_rendering_params); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, text_rendering_params %p.\n", iface, text_rendering_params); - *text_rendering_params = NULL; + if ((*text_rendering_params = render_target->text_rendering_params)) + IDWriteRenderingParams_AddRef(*text_rendering_params); } static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTags(ID2D1RenderTarget *iface, D2D1_TAG tag1, D2D1_TAG tag2)

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetFactory().
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: 237a0ada00a0888c1068b532485ff5bc58df9980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=237a0ada00a0888c1068b5324… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 09:41:16 2015 +0100 d2d1: Implement d2d_d3d_render_target_GetFactory(). --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/render_target.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index bbceb7f..18f26f0 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -50,6 +50,7 @@ struct d2d_d3d_render_target IDWriteTextRenderer IDWriteTextRenderer_iface; LONG refcount; + ID2D1Factory *factory; ID3D10Device *device; ID3D10RenderTargetView *view; ID3D10StateBlock *stateblock; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 83b4dab..15914ed 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -235,6 +235,7 @@ static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_Release(ID2D1RenderTarget * render_target->stateblock->lpVtbl->Release(render_target->stateblock); ID3D10RenderTargetView_Release(render_target->view); ID3D10Device_Release(render_target->device); + ID2D1Factory_Release(render_target->factory); HeapFree(GetProcessHeap(), 0, render_target); } @@ -243,9 +244,12 @@ static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_Release(ID2D1RenderTarget * static void STDMETHODCALLTYPE d2d_d3d_render_target_GetFactory(ID2D1RenderTarget *iface, ID2D1Factory **factory) { - FIXME("iface %p, factory %p stub!\n", iface, factory); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); - *factory = NULL; + *factory = render_target->factory; + ID2D1Factory_AddRef(*factory); } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmap(ID2D1RenderTarget *iface, @@ -1361,10 +1365,13 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, render_target->ID2D1RenderTarget_iface.lpVtbl = &d2d_d3d_render_target_vtbl; render_target->IDWriteTextRenderer_iface.lpVtbl = &d2d_text_renderer_vtbl; render_target->refcount = 1; + render_target->factory = factory; + ID2D1Factory_AddRef(render_target->factory); if (FAILED(hr = IDXGISurface_GetDevice(surface, &IID_ID3D10Device, (void **)&render_target->device))) { WARN("Failed to get device interface, hr %#x.\n", hr); + ID2D1Factory_Release(render_target->factory); return hr; } @@ -1521,5 +1528,6 @@ err: ID3D10RenderTargetView_Release(render_target->view); if (render_target->device) ID3D10Device_Release(render_target->device); + ID2D1Factory_Release(render_target->factory); return hr; }

1 0

Zheng Chen : msvcrt: Fix _copysign bugs for NAN/INF.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: 829e89318409d09701ba1d244e165685eb6dc830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=829e89318409d09701ba1d244… Author: Zheng Chen <ChanChengCC(a)gmail.com> Date: Tue Mar 24 09:51:12 2015 +0000 msvcrt: Fix _copysign bugs for NAN/INF. --- dlls/msvcrt/math.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 73f01aa..0cd69da 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -46,8 +46,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #endif #endif +/* FIXME: Does not work with -NAN and -0. */ #ifndef signbit -#define signbit(x) 0 +#define signbit(x) ((x) < 0) #endif typedef int (CDECL *MSVCRT_matherr_func)(struct MSVCRT__exception *); @@ -88,10 +89,9 @@ float CDECL MSVCRT__chgsignf( float num ) */ float CDECL MSVCRT__copysignf( float num, float sign ) { - /* FIXME: Behaviour for Nan/Inf? */ - if (sign < 0.0) - return num < 0.0 ? num : -num; - return num < 0.0 ? -num : num; + if (signbit(sign)) + return signbit(num) ? num : -num; + return signbit(num) ? -num : num; } /********************************************************************* @@ -1227,10 +1227,9 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask */ double CDECL MSVCRT__copysign(double num, double sign) { - /* FIXME: Behaviour for Nan/Inf? */ - if (sign < 0.0) - return num < 0.0 ? num : -num; - return num < 0.0 ? -num : num; + if (signbit(sign)) + return signbit(num) ? num : -num; + return signbit(num) ? -num : num; } /*********************************************************************

1 0

Sebastian Lackner : ntoskrnl: Emulate 'mov Eb, Gb' instruction on x86 processor architecture.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: b61d93a6b7dc45003fa036226710ec6f3c817138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b61d93a6b7dc45003fa036226… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 10 07:14:48 2014 +0100 ntoskrnl: Emulate 'mov Eb, Gb' instruction on x86 processor architecture. --- dlls/ntoskrnl.exe/instr.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index e170044..45021c6 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -59,7 +59,7 @@ static inline struct idtr get_idtr(void) } /* store an operand into a register */ -static void store_reg( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int long_op ) +static void store_reg_word( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int long_op ) { switch((regmodrm >> 3) & 7) { @@ -98,6 +98,22 @@ static void store_reg( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int lo } } +/* store an operand into a byte register */ +static void store_reg_byte( CONTEXT *context, BYTE regmodrm, const BYTE *addr ) +{ + switch((regmodrm >> 3) & 7) + { + case 0: context->Eax = (context->Eax & 0xffffff00) | *addr; break; + case 1: context->Ecx = (context->Ecx & 0xffffff00) | *addr; break; + case 2: context->Edx = (context->Edx & 0xffffff00) | *addr; break; + case 3: context->Ebx = (context->Ebx & 0xffffff00) | *addr; break; + case 4: context->Eax = (context->Eax & 0xffff00ff) | (*addr << 8); break; + case 5: context->Ecx = (context->Ecx & 0xffff00ff) | (*addr << 8); break; + case 6: context->Edx = (context->Edx & 0xffff00ff) | (*addr << 8); break; + case 7: context->Ebx = (context->Ebx & 0xffff00ff) | (*addr << 8); break; + } +} + /*********************************************************************** * INSTR_GetOperandAddr * @@ -404,19 +420,26 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) } break; /* Unable to emulate it */ + case 0x8a: /* mov Eb, Gb */ case 0x8b: /* mov Ev, Gv */ { - BYTE *addr = INSTR_GetOperandAddr(context, instr + 1, long_addr, + BYTE *data = INSTR_GetOperandAddr(context, instr + 1, long_addr, segprefix, &len); + unsigned int data_size = (*instr == 0x8b) ? (long_op ? 4 : 2) : 1; struct idtr idtr = get_idtr(); - unsigned int offset = addr - idtr.base; + unsigned int offset = data - idtr.base; - if (offset <= idtr.limit + 1 - (long_op ? 4 : 2)) + if (offset <= idtr.limit + 1 - data_size) { idt[1].LimitLow = 0x100; /* FIXME */ idt[2].LimitLow = 0x11E; /* FIXME */ idt[3].LimitLow = 0x500; /* FIXME */ - store_reg( context, instr[1], (BYTE *)idt + offset, long_op ); + + switch (*instr) + { + case 0x8a: store_reg_byte( context, instr[1], (BYTE *)idt + offset ); break; + case 0x8b: store_reg_word( context, instr[1], (BYTE *)idt + offset, long_op ); break; + } context->Eip += prefixlen + len + 1; return ExceptionContinueExecution; }

1 0

Michael Müller : kernel32/tests: Add tests for GetFinalPathNameByHandleA/W.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: 8f0d5a37a3552a1ab90687a7ffffe4b13ea5f4b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0d5a37a3552a1ab90687a7f… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Mar 26 05:13:43 2015 +0100 kernel32/tests: Add tests for GetFinalPathNameByHandleA/W. --- dlls/kernel32/tests/file.c | 176 +++++++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 9 +++ 2 files changed, 185 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f0d5a37a3552a1ab9068…

1 0

Francois Gouget : opengl32: Mark internal symbols with hidden visibility.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: 04b09dd68c1100ee0171b287dcb52bb1e85626f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04b09dd68c1100ee0171b287d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 26 15:30:26 2015 +0100 opengl32: Mark internal symbols with hidden visibility. --- dlls/opengl32/opengl_ext.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h index 5748e0c..2e49d4a 100644 --- a/dlls/opengl32/opengl_ext.h +++ b/dlls/opengl32/opengl_ext.h @@ -28,9 +28,9 @@ typedef struct { void *func; /* pointer to the Wine function for this extension */ } OpenGL_extension; -extern const OpenGL_extension extension_registry[]; -extern const int extension_registry_size; +extern const OpenGL_extension extension_registry[] DECLSPEC_HIDDEN; +extern const int extension_registry_size DECLSPEC_HIDDEN; -extern BOOL WINAPI wglSetPixelFormatWINE( HDC hdc, int format ); +extern BOOL WINAPI wglSetPixelFormatWINE( HDC hdc, int format ) DECLSPEC_HIDDEN; #endif /* __DLLS_OPENGL32_OPENGL_EXT_H */

1 0

Francois Gouget : user32: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: 68264c2da700434f26d54ecdde5af2761111bb25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68264c2da700434f26d54ecdd… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 26 15:29:46 2015 +0100 user32: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/user32/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 1f05f34..0ed4218 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -33,7 +33,7 @@ #include <assert.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h"

1 0

Francois Gouget : usbd.sys: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: de896a39538e934cdbb86891348f5b1d47edd830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de896a39538e934cdbb868913… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 26 15:29:38 2015 +0100 usbd.sys: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/usbd.sys/usbd.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c index fbec22e..1cb2525 100644 --- a/dlls/usbd.sys/usbd.c +++ b/dlls/usbd.sys/usbd.c @@ -19,7 +19,6 @@ #include <stdarg.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS

1 0

Francois Gouget : wineoss.drv: Remove an uneeded NONAMELESSUNION directive.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: 0ca3c64e92fe72c7ac81dade2946b2dd30316b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ca3c64e92fe72c7ac81dade2… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 26 15:29:30 2015 +0100 wineoss.drv: Remove an uneeded NONAMELESSUNION directive. --- dlls/wineoss.drv/mmdevdrv.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 0688f9a..cbaf1b2 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION #define COBJMACROS #include "config.h"

1 0

Pierre Schweitzer : setupapi: Implement SetupLogErrorA(), SetupLogErrorW() .
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: a851aaa4248b9f38c0c6e3b1c04e54f95de163b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a851aaa4248b9f38c0c6e3b1c… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Wed Mar 25 21:18:48 2015 +0100 setupapi: Implement SetupLogErrorA(), SetupLogErrorW(). --- dlls/setupapi/misc.c | 72 +++++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 9 ------ 3 files changed, 73 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index f294821..de73966 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1679,3 +1679,75 @@ BOOL WINAPI SetupOpenLog(BOOL reserved) return TRUE; } + +/*********************************************************************** + * SetupLogErrorA(SETUPAPI.@) + */ +BOOL WINAPI SetupLogErrorA(LPCSTR message, LogSeverity severity) +{ + static const char null[] = "(null)"; + BOOL ret; + DWORD written; + DWORD len; + + EnterCriticalSection(&setupapi_cs); + + if (setupact == INVALID_HANDLE_VALUE || setuperr == INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_FILE_INVALID); + ret = FALSE; + goto done; + } + + if (message == NULL) + message = null; + + len = lstrlenA(message); + + ret = WriteFile(setupact, message, len, &written, NULL); + if (!ret) + goto done; + + if (severity >= LogSevMaximum) + { + ret = FALSE; + goto done; + } + + if (severity > LogSevInformation) + ret = WriteFile(setuperr, message, len, &written, NULL); + +done: + LeaveCriticalSection(&setupapi_cs); + return ret; +} + +/*********************************************************************** + * SetupLogErrorW(SETUPAPI.@) + */ +BOOL WINAPI SetupLogErrorW(LPCWSTR message, LogSeverity severity) +{ + LPSTR msg = NULL; + DWORD len; + BOOL ret; + + if (message) + { + len = WideCharToMultiByte(CP_ACP, 0, message, -1, NULL, 0, NULL, NULL); + msg = HeapAlloc(GetProcessHeap(), 0, len); + if (msg == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + WideCharToMultiByte(CP_ACP, 0, message, -1, msg, len, NULL, NULL); + } + + /* This is the normal way to proceed. The log files are ASCII files + * and W is to be converted. + */ + ret = SetupLogErrorA(msg, severity); + + HeapFree(GetProcessHeap(), 0, msg); + return ret; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 4fcf298..c1dbed5 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -459,7 +459,7 @@ @ stdcall SetupInstallServicesFromInfSectionW(long wstr long) @ stdcall SetupIterateCabinetA(str long ptr ptr) @ stdcall SetupIterateCabinetW(wstr long ptr ptr) -@ stub SetupLogErrorA +@ stdcall SetupLogErrorA(str long) @ stdcall SetupLogErrorW(wstr long) @ stdcall SetupLogFileA(ptr str str str long str str str long) @ stdcall SetupLogFileW(ptr wstr wstr wstr long wstr wstr wstr long) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 66bd5d4..a57f5fe 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -189,15 +189,6 @@ BOOL WINAPI RegistryDelnode(DWORD x, DWORD y) } /*********************************************************************** - * SetupLogErrorW(SETUPAPI.@) - */ -BOOL WINAPI SetupLogErrorW(LPCWSTR MessageString, LogSeverity Severity) -{ - FIXME("(%s, %d) stub\n", debugstr_w(MessageString), Severity); - return TRUE; -} - -/*********************************************************************** * SetupPromptReboot(SETUPAPI.@) */ INT WINAPI SetupPromptReboot( HSPFILEQ file_queue, HWND owner, BOOL scan_only )

1 0