September 2013 - Wine-Commits

Alistair Leslie-Hughes : oledb32: Correct DataLinks interface for win64.
by Alexandre Julliard Sept. 25, 2013

Sept. 25, 2013

Module: wine Branch: master Commit: 3d193930ab33ab521fff8028fc309d605432e2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d193930ab33ab521fff8028f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 16 09:44:39 2013 +1000 oledb32: Correct DataLinks interface for win64. --- dlls/oledb32/dslocator.c | 6 +++--- include/msdasc.idl | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index dcc2fe3..f8a98f5 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -135,7 +135,7 @@ static HRESULT WINAPI dslocator_Invoke(IDataSourceLocator *iface, DISPID dispIdM return E_NOTIMPL; } -static HRESULT WINAPI dslocator_get_hWnd(IDataSourceLocator *iface, LONG *phwndParent) +static HRESULT WINAPI dslocator_get_hWnd(IDataSourceLocator *iface, COMPATIBLE_LONG *phwndParent) { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); @@ -144,11 +144,11 @@ static HRESULT WINAPI dslocator_get_hWnd(IDataSourceLocator *iface, LONG *phwndP return E_NOTIMPL; } -static HRESULT WINAPI dslocator_put_hWnd(IDataSourceLocator *iface, LONG phwndParent) +static HRESULT WINAPI dslocator_put_hWnd(IDataSourceLocator *iface, COMPATIBLE_LONG hwndParent) { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); - FIXME("(%p)->(%d)\n",This, phwndParent); + FIXME("(%p)->(%p)\n",This, (HWND)hwndParent); return E_NOTIMPL; } diff --git a/include/msdasc.idl b/include/msdasc.idl index 25610e5..e3efb1d 100644 --- a/include/msdasc.idl +++ b/include/msdasc.idl @@ -26,6 +26,8 @@ import "oledb.idl"; #define vi_progid(str) #endif +typedef LONG_PTR COMPATIBLE_LONG; + [ uuid(2206CEB0-19C1-11D1-89E0-00C04FD7A829), version(1.0) @@ -56,10 +58,10 @@ library MSDASC interface IDataSourceLocator : IDispatch { [id(0x60020000), propget] - HRESULT hWnd([out, retval] long* phwndParent); + HRESULT hWnd([out, retval] COMPATIBLE_LONG* phwndParent); [id(0x60020000), propput] - HRESULT hWnd([in] long phwndParent); + HRESULT hWnd([in] COMPATIBLE_LONG hwndParent); [id(0x60020002), helpstring("PromptNew")] HRESULT PromptNew([out, retval] IDispatch** ppADOConnection);

1 0

Frédéric Delanoy : advapi32: Use BOOL type where appropriate.
by Alexandre Julliard Sept. 25, 2013

Sept. 25, 2013

Module: wine Branch: master Commit: ce88fd16ae985e1a114298ec10352f674d40bde1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce88fd16ae985e1a114298ec1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 25 15:01:43 2013 +0200 advapi32: Use BOOL type where appropriate. --- dlls/advapi32/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index e4f7586..e999ce6 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -79,7 +79,7 @@ static const WCHAR * const root_key_names[] = static HKEY special_root_keys[NB_SPECIAL_ROOT_KEYS]; static BOOL hkcu_cache_disabled; -static const int is_win64 = (sizeof(void *) > sizeof(int)); +static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); /* check if value type needs string conversion (Ansi<->Unicode) */ static inline int is_string( DWORD type )

1 0

Piotr Caban : msvcrt: Call MSVCRT_strtoi64_l in strtol implementation.
by Alexandre Julliard Sept. 25, 2013

Sept. 25, 2013

Module: wine Branch: master Commit: c3c44544ff0e2446979117daebddb70124a0afe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3c44544ff0e2446979117dae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 25 14:41:40 2013 +0200 msvcrt: Call MSVCRT_strtoi64_l in strtol implementation. --- dlls/msvcrt/string.c | 52 +++++++++++++++++-------------------------------- 1 files changed, 18 insertions(+), 34 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index d3bde66..cdce4a2 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -727,40 +727,6 @@ int CDECL __STRINGTOLD( MSVCRT__LDOUBLE *value, char **endptr, const char *str, } /****************************************************************** - * strtol (MSVCRT.@) - */ -MSVCRT_long CDECL MSVCRT_strtol(const char* nptr, char** end, int base) -{ - /* wrapper to forward libc error code to msvcrt's error codes */ - long ret; - - errno = 0; - ret = strtol(nptr, end, base); - switch (errno) - { - case ERANGE: *MSVCRT__errno() = MSVCRT_ERANGE; break; - case EINVAL: *MSVCRT__errno() = MSVCRT_EINVAL; break; - default: - /* cope with the fact that we may use 64bit long integers on libc - * while msvcrt always uses 32bit long integers - */ - if (ret > MSVCRT_LONG_MAX) - { - ret = MSVCRT_LONG_MAX; - *MSVCRT__errno() = MSVCRT_ERANGE; - } - else if (ret < -MSVCRT_LONG_MAX - 1) - { - ret = -MSVCRT_LONG_MAX - 1; - *MSVCRT__errno() = MSVCRT_ERANGE; - } - break; - } - - return ret; -} - -/****************************************************************** * strtoul (MSVCRT.@) */ MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) @@ -934,6 +900,24 @@ int __cdecl MSVCRT_atoi(const char *str) return minus ? -ret : ret; } +/****************************************************************** + * strtol (MSVCRT.@) + */ +MSVCRT_long CDECL MSVCRT_strtol(const char* nptr, char** end, int base) +{ + __int64 ret = MSVCRT_strtoi64_l(nptr, end, base, NULL); + + if(ret > MSVCRT_LONG_MAX) { + ret = MSVCRT_LONG_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + } else if(ret < MSVCRT_LONG_MIN) { + ret = MSVCRT_LONG_MIN; + *MSVCRT__errno() = MSVCRT_ERANGE; + } + + return ret; +} + /********************************************************************* * _strtoui64_l (MSVCRT.@) *

1 0

Frédéric Delanoy : windowscodecs: Use BOOL type where appropriate.
by Alexandre Julliard Sept. 25, 2013

Sept. 25, 2013

Module: wine Branch: master Commit: 2413841ecb8c845591e0c8173cd22a724dd82bde URL: http://source.winehq.org/git/wine.git/?a=commit;h=2413841ecb8c845591e0c8173… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 25 15:01:44 2013 +0200 windowscodecs: Use BOOL type where appropriate. --- dlls/windowscodecs/icoformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index d245031..682f5f5 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -232,7 +232,7 @@ static HRESULT ReadIcoDib(IStream *stream, IcoFrameDecode *result) IWICBitmapFrameDecode *framedecode; WICPixelFormatGUID pixelformat; IWICBitmapSource *source; - int has_alpha=FALSE; /* if TRUE, alpha data might be in the image data */ + BOOL has_alpha=FALSE; /* if TRUE, alpha data might be in the image data */ WICRect rc; hr = IcoDibDecoder_CreateInstance(&bmp_decoder);

1 0

Jacek Caban : mshtml: Wine Gecko 2.24 release.
by Alexandre Julliard Sept. 25, 2013

Sept. 25, 2013

Module: wine Branch: master Commit: 0be56d27d2d4b22367313fa4c6f1e65865c90438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be56d27d2d4b22367313fa4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 25 14:17:08 2013 +0200 mshtml: Wine Gecko 2.24 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/htmlelem.c | 24 +++--- dlls/mshtml/htmlwindow.c | 7 ++- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsiface.idl | 180 +++++++++++++++++++++++++++------------------- 5 files changed, 127 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0be56d27d2d4b22367313…

1 0

Piotr Caban : msvcrt: Fix internal LONG_MAX and ULONG_MAX definitions.
by Alexandre Julliard Sept. 25, 2013

Sept. 25, 2013

Module: wine Branch: master Commit: b01f8881293cc9661d3d5ba919b13f1a2fbc9687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b01f8881293cc9661d3d5ba91… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 25 14:41:30 2013 +0200 msvcrt: Fix internal LONG_MAX and ULONG_MAX definitions. --- dlls/msvcrt/msvcrt.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 98922af..4e41a7d 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -41,9 +41,9 @@ #include "windef.h" #include "winbase.h" -#define MSVCRT_LONG_MAX 0x7fffffffL +#define MSVCRT_LONG_MAX 0x7fffffff #define MSVCRT_LONG_MIN (-MSVCRT_LONG_MAX-1) -#define MSVCRT_ULONG_MAX 0xffffffffUL +#define MSVCRT_ULONG_MAX 0xffffffff #define MSVCRT_I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) #define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1) #define MSVCRT_UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff)

1 0

Lu Jiashu : winmm: Clone the whole adwInfo array in MMIO_Open.
by Alexandre Julliard Sept. 25, 2013

Sept. 25, 2013

Module: wine Branch: master Commit: a0ed65f5937e6eb13f6b2b345d8d27fbd4616c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ed65f5937e6eb13f6b2b345… Author: Lu Jiashu <lujiashu(a)163.com> Date: Tue Sep 24 11:40:54 2013 +0800 winmm: Clone the whole adwInfo array in MMIO_Open. --- dlls/winmm/mmio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 73cad60..c8f3745 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -664,7 +664,7 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, wm->bBufferLoaded = TRUE; /* see mmioDosIOProc for that one */ - wm->info.adwInfo[0] = refmminfo->adwInfo[0]; + memcpy( wm->info.adwInfo, refmminfo->adwInfo, sizeof(wm->info.adwInfo) ); /* call IO proc to actually open file */ refmminfo->wErrorRet = send_message(wm->ioProc, &wm->info, MMIOM_OPEN,

1 0

Rico Schüller : d3dx9: Use struct d3dx_object for objects.
by Alexandre Julliard Sept. 25, 2013

Sept. 25, 2013

Module: wine Branch: master Commit: f7ba8e1472d3db3043ed2abf034a92de03640c83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7ba8e1472d3db3043ed2abf0… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Sep 24 22:50:20 2013 +0200 d3dx9: Use struct d3dx_object for objects. --- dlls/d3dx9_36/effect.c | 248 ++++++++++++++++++----------------------------- 1 files changed, 95 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7ba8e1472d3db3043ed2…

1 0

Sebastian Lackner : winex11: Added missing release_win_data() to create_foreign_window().
by Alexandre Julliard Sept. 25, 2013

Sept. 25, 2013

Module: wine Branch: master Commit: 5fb74c48d10e1f511adc43caf44d09e489c5c29e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb74c48d10e1f511adc43caf… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 24 05:50:33 2013 +0200 winex11: Added missing release_win_data() to create_foreign_window(). --- dlls/winex11.drv/window.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 429602b..1ff36eb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1897,11 +1897,12 @@ HWND create_foreign_window( Display *display, Window xwin ) SetPropA( hwnd, foreign_window_prop, (HANDLE)xwin ); XSaveContext( display, xwin, winContext, (char *)data->hwnd ); - ShowWindow( hwnd, SW_SHOW ); - TRACE( "win %lx parent %p style %08x %s -> hwnd %p\n", xwin, parent, style, wine_dbgstr_rect(&data->window_rect), hwnd ); + release_win_data( data ); + + ShowWindow( hwnd, SW_SHOW ); return hwnd; }

1 0

Henri Verbeet : wined3d: Introduce a function to initialize swapchain specific device state.
by Alexandre Julliard Sept. 25, 2013

Sept. 25, 2013

Module: wine Branch: master Commit: 8866d733e4296138071c0ceb85aabef51bd8781e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8866d733e4296138071c0ceb8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 25 09:58:13 2013 +0200 wined3d: Introduce a function to initialize swapchain specific device state. --- dlls/wined3d/device.c | 51 ++++++++++++++++---------------------------- dlls/wined3d/stateblock.c | 5 +--- 2 files changed, 20 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1ab4a49..2014338 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -827,21 +827,23 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) InterlockedExchangePointer((void **)&device->focus_window, NULL); } -static void device_reset_viewport_scissor(struct wined3d_device *device, UINT width, UINT height) +static void device_init_swapchain_state(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { - struct wined3d_state *state = &device->state; + BOOL ds_enable = !!swapchain->desc.enable_auto_depth_stencil; + unsigned int i; - state->viewport.x = 0; - state->viewport.y = 0; - state->viewport.width = width; - state->viewport.height = height; - state->viewport.min_z = 0.0f; - state->viewport.max_z = 1.0f; + if (device->fb.render_targets) + { + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + { + wined3d_device_set_render_target(device, i, NULL, FALSE); + } + if (swapchain->back_buffers && swapchain->back_buffers[0]) + wined3d_device_set_render_target(device, 0, swapchain->back_buffers[0], TRUE); + } - state->scissor_rect.left = 0; - state->scissor_rect.top = 0; - state->scissor_rect.right = width; - state->scissor_rect.bottom = height; + wined3d_device_set_depth_stencil(device, ds_enable ? device->auto_depth_stencil : NULL); + wined3d_device_set_render_state(device, WINED3D_RS_ZENABLE, ds_enable); } HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, @@ -895,25 +897,8 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, } device->swapchains[0] = swapchain; - if (swapchain->back_buffers && swapchain->back_buffers[0]) - { - TRACE("Setting rendertarget to %p.\n", swapchain->back_buffers); - device->fb.render_targets[0] = swapchain->back_buffers[0]; - wined3d_surface_incref(device->fb.render_targets[0]); - clear_flags |= WINED3DCLEAR_TARGET; - } - - /* Depth Stencil support */ - device->fb.depth_stencil = device->auto_depth_stencil; - if (device->fb.depth_stencil) - wined3d_surface_incref(device->fb.depth_stencil); - - /* Set up some starting GL setup */ - - /* Setup all the devices defaults */ state_init_default(&device->state, device); - device_reset_viewport_scissor(device, swapchain->desc.backbuffer_width, - swapchain->desc.backbuffer_height); + device_init_swapchain_state(device, swapchain); context = context_acquire(device, swapchain->front_buffer); @@ -947,6 +932,8 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, context_release(context); /* Clear the screen */ + if (swapchain->back_buffers && swapchain->back_buffers[0]) + clear_flags |= WINED3DCLEAR_TARGET; if (swapchain_desc->enable_auto_depth_stencil) clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; if (clear_flags) @@ -4726,9 +4713,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (FAILED(hr = state_init(&device->state, &device->adapter->d3d_info))) ERR("Failed to initialize device state, hr %#x.\n", hr); state_init_default(&device->state, device); - device_reset_viewport_scissor(device, swapchain->desc.backbuffer_width, - swapchain->desc.backbuffer_height); device->update_state = &device->state; + + device_init_swapchain_state(device, swapchain); } else { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 04bedf1..6bdbb1b 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1203,10 +1203,7 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi TRACE("Render states\n"); /* Render states: */ - if (device->auto_depth_stencil) - state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_TRUE; - else - state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_FALSE; + state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_TRUE; state->render_states[WINED3D_RS_FILLMODE] = WINED3D_FILL_SOLID; state->render_states[WINED3D_RS_SHADEMODE] = WINED3D_SHADE_GOURAUD; lp.lp.repeat_factor = 0;

1 0