July 2012 - Wine-commits - list.winehq.org

Henri Verbeet : d3d8: Introduce a helper function to create a wined3d_swapchain_desc from D3DPRESENT_PARAMETERS .
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: b4d0b4e452540f102fc718d2c08ca2ec4a8f0f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d0b4e452540f102fc718d2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 3 12:59:41 2012 +0200 d3d8: Introduce a helper function to create a wined3d_swapchain_desc from D3DPRESENT_PARAMETERS. --- dlls/d3d8/device.c | 72 +++++++++++++++++---------------------------------- 1 files changed, 24 insertions(+), 48 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2ec1369..eea4a24 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -164,6 +164,27 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +static void wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, + const D3DPRESENT_PARAMETERS *present_parameters) +{ + swapchain_desc->backbuffer_width = present_parameters->BackBufferWidth; + swapchain_desc->backbuffer_height = present_parameters->BackBufferHeight; + swapchain_desc->backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); + swapchain_desc->backbuffer_count = max(1, present_parameters->BackBufferCount); + swapchain_desc->multisample_type = present_parameters->MultiSampleType; + swapchain_desc->multisample_quality = 0; /* d3d9 only */ + swapchain_desc->swap_effect = present_parameters->SwapEffect; + swapchain_desc->device_window = present_parameters->hDeviceWindow; + swapchain_desc->windowed = present_parameters->Windowed; + swapchain_desc->enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil; + swapchain_desc->auto_depth_stencil_format + = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); + swapchain_desc->flags = present_parameters->Flags; + swapchain_desc->refresh_rate = present_parameters->FullScreen_RefreshRateInHz; + swapchain_desc->swap_interval = present_parameters->FullScreen_PresentationInterval; + swapchain_desc->auto_restore_display_mode = TRUE; +} + /* Handle table functions */ static DWORD d3d8_allocate_handle(struct d3d8_handle_table *t, void *object, enum d3d8_handle_type type) { @@ -511,22 +532,7 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if TRACE("iface %p, present_parameters %p, swapchain %p.\n", iface, present_parameters, swapchain); - desc.backbuffer_width = present_parameters->BackBufferWidth; - desc.backbuffer_height = present_parameters->BackBufferHeight; - desc.backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); - desc.backbuffer_count = max(1, present_parameters->BackBufferCount); - desc.multisample_type = present_parameters->MultiSampleType; - desc.multisample_quality = 0; /* d3d9 only */ - desc.swap_effect = present_parameters->SwapEffect; - desc.device_window = present_parameters->hDeviceWindow; - desc.windowed = present_parameters->Windowed; - desc.enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil; - desc.auto_depth_stencil_format = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); - desc.flags = present_parameters->Flags; - desc.refresh_rate = present_parameters->FullScreen_RefreshRateInHz; - desc.swap_interval = present_parameters->FullScreen_PresentationInterval; - desc.auto_restore_display_mode = TRUE; - + wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); if (SUCCEEDED(hr = d3d8_swapchain_create(device, &desc, &object))) *swapchain = &object->IDirect3DSwapChain8_iface; @@ -585,23 +591,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, TRACE("iface %p, present_parameters %p.\n", iface, present_parameters); wined3d_mutex_lock(); - - swapchain_desc.backbuffer_width = present_parameters->BackBufferWidth; - swapchain_desc.backbuffer_height = present_parameters->BackBufferHeight; - swapchain_desc.backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); - swapchain_desc.backbuffer_count = max(1, present_parameters->BackBufferCount); - swapchain_desc.multisample_type = present_parameters->MultiSampleType; - swapchain_desc.multisample_quality = 0; /* d3d9 only */ - swapchain_desc.swap_effect = present_parameters->SwapEffect; - swapchain_desc.device_window = present_parameters->hDeviceWindow; - swapchain_desc.windowed = present_parameters->Windowed; - swapchain_desc.enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil; - swapchain_desc.auto_depth_stencil_format = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); - swapchain_desc.flags = present_parameters->Flags; - swapchain_desc.refresh_rate = present_parameters->FullScreen_RefreshRateInHz; - swapchain_desc.swap_interval = present_parameters->FullScreen_PresentationInterval; - swapchain_desc.auto_restore_display_mode = TRUE; - + wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, reset_enum_callback))) { hr = wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); @@ -3069,21 +3059,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine if (flags & D3DCREATE_MULTITHREADED) wined3d_device_set_multithreaded(device->wined3d_device); - swapchain_desc.backbuffer_width = parameters->BackBufferWidth; - swapchain_desc.backbuffer_height = parameters->BackBufferHeight; - swapchain_desc.backbuffer_format = wined3dformat_from_d3dformat(parameters->BackBufferFormat); - swapchain_desc.backbuffer_count = max(1, parameters->BackBufferCount); - swapchain_desc.multisample_type = parameters->MultiSampleType; - swapchain_desc.multisample_quality = 0; /* d3d9 only */ - swapchain_desc.swap_effect = parameters->SwapEffect; - swapchain_desc.device_window = parameters->hDeviceWindow; - swapchain_desc.windowed = parameters->Windowed; - swapchain_desc.enable_auto_depth_stencil = parameters->EnableAutoDepthStencil; - swapchain_desc.auto_depth_stencil_format = wined3dformat_from_d3dformat(parameters->AutoDepthStencilFormat); - swapchain_desc.flags = parameters->Flags; - swapchain_desc.refresh_rate = parameters->FullScreen_RefreshRateInHz; - swapchain_desc.swap_interval = parameters->FullScreen_PresentationInterval; - swapchain_desc.auto_restore_display_mode = TRUE; + wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, parameters); hr = wined3d_device_init_3d(device->wined3d_device, &swapchain_desc); if (FAILED(hr))

1 0

Henri Verbeet : d3d8: Introduce a helper function to create D3DPRESENT_PARAMETERS from a wined3d_swapchain_desc .
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 3509c89194b3d191b18a13c3f3bba9c8f34cc242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3509c89194b3d191b18a13c3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 3 12:59:42 2012 +0200 d3d8: Introduce a helper function to create D3DPRESENT_PARAMETERS from a wined3d_swapchain_desc. --- dlls/d3d8/device.c | 48 +++++++++++++++++++++--------------------------- 1 files changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index eea4a24..e3fee4a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -164,6 +164,25 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, + const struct wined3d_swapchain_desc *swapchain_desc) +{ + present_parameters->BackBufferWidth = swapchain_desc->backbuffer_width; + present_parameters->BackBufferHeight = swapchain_desc->backbuffer_height; + present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc->backbuffer_format); + present_parameters->BackBufferCount = swapchain_desc->backbuffer_count; + present_parameters->MultiSampleType = swapchain_desc->multisample_type; + present_parameters->SwapEffect = swapchain_desc->swap_effect; + present_parameters->hDeviceWindow = swapchain_desc->device_window; + present_parameters->Windowed = swapchain_desc->windowed; + present_parameters->EnableAutoDepthStencil = swapchain_desc->enable_auto_depth_stencil; + present_parameters->AutoDepthStencilFormat + = d3dformat_from_wined3dformat(swapchain_desc->auto_depth_stencil_format); + present_parameters->Flags = swapchain_desc->flags; + present_parameters->FullScreen_RefreshRateInHz = swapchain_desc->refresh_rate; + present_parameters->FullScreen_PresentationInterval = swapchain_desc->swap_interval; +} + static void wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, const D3DPRESENT_PARAMETERS *present_parameters) { @@ -535,20 +554,7 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); if (SUCCEEDED(hr = d3d8_swapchain_create(device, &desc, &object))) *swapchain = &object->IDirect3DSwapChain8_iface; - - present_parameters->BackBufferWidth = desc.backbuffer_width; - present_parameters->BackBufferHeight = desc.backbuffer_height; - present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(desc.backbuffer_format); - present_parameters->BackBufferCount = desc.backbuffer_count; - present_parameters->MultiSampleType = desc.multisample_type; - present_parameters->SwapEffect = desc.swap_effect; - present_parameters->hDeviceWindow = desc.device_window; - present_parameters->Windowed = desc.windowed; - present_parameters->EnableAutoDepthStencil = desc.enable_auto_depth_stencil; - present_parameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(desc.auto_depth_stencil_format); - present_parameters->Flags = desc.flags; - present_parameters->FullScreen_RefreshRateInHz = desc.refresh_rate; - present_parameters->FullScreen_PresentationInterval = desc.swap_interval; + present_parameters_from_wined3d_swapchain_desc(present_parameters, &desc); return D3D_OK; } @@ -3080,19 +3086,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine goto err; } - parameters->BackBufferWidth = swapchain_desc.backbuffer_width; - parameters->BackBufferHeight = swapchain_desc.backbuffer_height; - parameters->BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc.backbuffer_format); - parameters->BackBufferCount = swapchain_desc.backbuffer_count; - parameters->MultiSampleType = swapchain_desc.multisample_type; - parameters->SwapEffect = swapchain_desc.swap_effect; - parameters->hDeviceWindow = swapchain_desc.device_window; - parameters->Windowed = swapchain_desc.windowed; - parameters->EnableAutoDepthStencil = swapchain_desc.enable_auto_depth_stencil; - parameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(swapchain_desc.auto_depth_stencil_format); - parameters->Flags = swapchain_desc.flags; - parameters->FullScreen_RefreshRateInHz = swapchain_desc.refresh_rate; - parameters->FullScreen_PresentationInterval = swapchain_desc.swap_interval; + present_parameters_from_wined3d_swapchain_desc(parameters, &swapchain_desc); device->declArraySize = 16; device->decls = HeapAlloc(GetProcessHeap(), 0, device->declArraySize * sizeof(*device->decls));

1 0

Henri Verbeet : winex11: Use our own structure for mode information.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 3ea8de2637bd2d1bf08af74a180ef26b7e03ee0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea8de2637bd2d1bf08af74a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 3 12:59:43 2012 +0200 winex11: Use our own structure for mode information. --- dlls/winex11.drv/desktop.c | 17 ++++++------- dlls/winex11.drv/settings.c | 52 +++++++++++++++++++------------------------ dlls/winex11.drv/x11drv.h | 19 ++++++++++----- dlls/winex11.drv/xrandr.c | 33 +++++++++++++-------------- dlls/winex11.drv/xvidmode.c | 31 ++++++++++--------------- dlls/winex11.drv/xvidmode.h | 1 - 6 files changed, 73 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ea8de2637bd2d1bf08af…

1 0

Alexandre Julliard : winex11: Use the correct drawable with the X11DRV_GET_DRAWABLE escape.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 241ab9257cc54bbfdada56b036fe04c03779aec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=241ab9257cc54bbfdada56b03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 3 16:56:40 2012 +0200 winex11: Use the correct drawable with the X11DRV_GET_DRAWABLE escape. --- dlls/winex11.drv/opengl.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 81ec492..f43127c 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1610,7 +1610,7 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) } else { - if (escape.gl_type == DC_GL_BITMAP) escape.drawable = get_context_pixmap( hdc, ctx ); + if (escape.gl_type == DC_GL_BITMAP) escape.gl_drawable = get_context_pixmap( hdc, ctx ); wine_tsx11_lock(); @@ -1619,10 +1619,10 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) pglXGetFBConfigAttrib(gdi_display, ctx->fmt->fbconfig, GLX_VISUAL_ID, &vis_id); describeContext(ctx); TRACE("hdc %p drawable %lx fmt %u vis %x ctx %p\n", hdc, - escape.drawable, escape.pixel_format, vis_id, ctx->ctx); + escape.gl_drawable, escape.pixel_format, vis_id, ctx->ctx); } - ret = pglXMakeCurrent(gdi_display, escape.drawable, ctx->ctx); + ret = pglXMakeCurrent(gdi_display, escape.gl_drawable, ctx->ctx); if (ret) { @@ -1631,8 +1631,8 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) ctx->has_been_current = TRUE; ctx->hdc = hdc; ctx->read_hdc = hdc; - ctx->drawables[0] = escape.drawable; - ctx->drawables[1] = escape.drawable; + ctx->drawables[0] = escape.gl_drawable; + ctx->drawables[1] = escape.gl_drawable; ctx->refresh_drawables = FALSE; if (escape.gl_type == DC_GL_BITMAP) pglDrawBuffer(GL_FRONT_LEFT); @@ -1684,18 +1684,18 @@ static BOOL glxdrv_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct { if (!pglXMakeContextCurrent) return FALSE; - if (escape_draw.gl_type == DC_GL_BITMAP) escape_draw.drawable = get_context_pixmap( draw_hdc, ctx ); - if (escape_read.gl_type == DC_GL_BITMAP) escape_read.drawable = get_context_pixmap( read_hdc, ctx ); + if (escape_draw.gl_type == DC_GL_BITMAP) escape_draw.gl_drawable = get_context_pixmap( draw_hdc, ctx ); + if (escape_read.gl_type == DC_GL_BITMAP) escape_read.gl_drawable = get_context_pixmap( read_hdc, ctx ); wine_tsx11_lock(); - ret = pglXMakeContextCurrent(gdi_display, escape_draw.drawable, escape_read.drawable, ctx->ctx); + ret = pglXMakeContextCurrent(gdi_display, escape_draw.gl_drawable, escape_read.gl_drawable, ctx->ctx); if (ret) { ctx->has_been_current = TRUE; ctx->hdc = draw_hdc; ctx->read_hdc = read_hdc; - ctx->drawables[0] = escape_draw.drawable; - ctx->drawables[1] = escape_read.drawable; + ctx->drawables[0] = escape_draw.gl_drawable; + ctx->drawables[1] = escape_read.gl_drawable; ctx->refresh_drawables = FALSE; NtCurrentTeb()->glContext = ctx; }

1 0

Piotr Caban : msvcp90: Keep class definitions in separate file.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 6c864c699d85aa8bf6f849c285d3dc70e350c28e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c864c699d85aa8bf6f849c28… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 3 16:52:39 2012 +0200 msvcp90: Keep class definitions in separate file. --- dlls/msvcp90/cxx.h | 224 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 212 +-------------------------------------------- 2 files changed, 227 insertions(+), 209 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c864c699d85aa8bf6f84…

1 0

Piotr Caban : msvcp60: Keep class definitions in separate file.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: e29c3066bc0a1a3716baf9e325fa8855f4113c19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e29c3066bc0a1a3716baf9e32… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 3 16:53:00 2012 +0200 msvcp60: Keep class definitions in separate file. --- dlls/msvcp60/cxx.h | 224 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp60/exception.c | 18 ++-- dlls/msvcp60/msvcp.h | 189 +-------------------------------------- 3 files changed, 237 insertions(+), 194 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e29c3066bc0a1a3716baf…

1 0

Piotr Caban : msvcp71: Forward basic_string::_Myptr functions to msvcp90.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: c7636fe69b1f8de9fd7b4e27996674ff220ad389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7636fe69b1f8de9fd7b4e279… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 3 16:53:23 2012 +0200 msvcp71: Forward basic_string::_Myptr functions to msvcp90. --- dlls/msvcp71/msvcp71.spec | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 671950b..778b50f 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -2317,12 +2317,12 @@ @ stub -arch=win64 ?_Makpat@?$_Mpunct(a)G@std@@AEAAXAEAUpattern(a)money_base@2(a)III@Z @ stub -arch=win32 ?_Makpat@?$_Mpunct(a)_W@std@@AAEXAAUpattern(a)money_base@2(a)III@Z @ stub -arch=win64 ?_Makpat@?$_Mpunct(a)_W@std@@AEAAXAEAUpattern(a)money_base@2(a)III@Z -@ stub -arch=win32 ?_Myptr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEPADXZ -@ stub -arch=win32 ?_Myptr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ -@ stub -arch=win32 ?_Myptr@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEPAGXZ -@ stub -arch=win32 ?_Myptr@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEPBGXZ -@ stub -arch=win32 ?_Myptr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEPA_WXZ -@ stub -arch=win32 ?_Myptr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ +@ thiscall -arch=win32 ?_Myptr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEPADXZ(ptr) msvcp90.?_Myptr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAEPADXZ +@ thiscall -arch=win32 ?_Myptr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ(ptr) msvcp90.?_Myptr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IBEPBDXZ +@ thiscall -arch=win32 ?_Myptr@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEPAGXZ(ptr) msvcp90.?_Myptr@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@IAEPAGXZ +@ thiscall -arch=win32 ?_Myptr@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEPBGXZ(ptr) msvcp90.?_Myptr@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@IBEPBGXZ +@ thiscall -arch=win32 ?_Myptr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEPA_WXZ(ptr) msvcp90.?_Myptr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAEPA_WXZ +@ thiscall -arch=win32 ?_Myptr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ(ptr) msvcp90.?_Myptr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IBEPB_WXZ @ stub ?_Nanv@?$_Ctraits(a)M@std@@SAMM(a)Z @ stub ?_Nanv@?$_Ctraits(a)N@std@@SANN(a)Z @ stub ?_Nanv@?$_Ctraits(a)O@std@@SAOO(a)Z

1 0

Piotr Caban : msvcp71: Forward basic_string::operator{<, <=, >, >=} to msvcp90 .
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: c5cd3d4d765bcc02c88bef6d87e6348154845a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5cd3d4d765bcc02c88bef6d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 3 16:55:09 2012 +0200 msvcp71: Forward basic_string::operator{<,<=,>,>=} to msvcp90. --- dlls/msvcp70/msvcp70.spec | 120 ++++++++++++++++++++++---------------------- 1 files changed, 60 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5cd3d4d765bcc02c88be…

1 0

Piotr Caban : msvcp90: Added locale::empty implementation.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 0bd5ba82de606bc4a4091c0ad396bbdc78311244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd5ba82de606bc4a4091c0ad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 3 16:55:29 2012 +0200 msvcp90: Added locale::empty implementation. --- dlls/msvcp90/locale.c | 16 ++++++++++++++++ dlls/msvcp90/msvcp90.spec | 2 +- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index d3b0262..8e3778f 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -8175,6 +8175,22 @@ const locale* __cdecl locale_classic(void) return &classic_locale; } +/* ?empty(a)locale@std@@SA?AV12(a)XZ */ +locale* __cdecl locale_empty(locale *ret) +{ + TRACE("\n"); + + locale__Init(); + + ret->ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); + if(!ret->ptr) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + locale__Locimp_ctor_transparent(ret->ptr, TRUE); + return ret; +} + /* ?name(a)locale@std@@QBE?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ */ /* ?name(a)locale@std@@QEBA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ */ DEFINE_THISCALL_WRAPPER(locale_name, 8) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 35fe11d..8cffefb 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3704,7 +3704,7 @@ @ cdecl -arch=win64 ?empty@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_NXZ(ptr) MSVCP_basic_string_wchar_empty @ thiscall -arch=win32 ?empty@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE_NXZ(ptr) MSVCP_basic_string_wchar_empty @ cdecl -arch=win64 ?empty@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_NXZ(ptr) MSVCP_basic_string_wchar_empty -@ stub ?empty(a)locale@std@@SA?AV12(a)XZ +@ cdecl ?empty(a)locale@std@@SA?AV12(a)XZ(ptr) locale_empty @ thiscall -arch=win32 ?encoding(a)codecvt_base@std@@QBEHXZ(ptr) codecvt_base_encoding @ cdecl -arch=win64 ?encoding(a)codecvt_base@std@@QEBAHXZ(ptr) codecvt_base_encoding @ thiscall -arch=win32 ?end@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ(ptr ptr) MSVCP_basic_string_char_end

1 0

Michael Stefaniuc : quartz: Use StdMemAllocator_from_IMemAllocator() instead of casts.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 56e3b22f6cef4a3874a80c2ddfaae0bfb4c14fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e3b22f6cef4a3874a80c2dd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 3 00:21:28 2012 +0200 quartz: Use StdMemAllocator_from_IMemAllocator() instead of casts. --- dlls/quartz/memallocator.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index cc700c2..f1903f9 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -809,9 +809,14 @@ typedef struct StdMemAllocator LPVOID pMemory; } StdMemAllocator; +static inline StdMemAllocator *StdMemAllocator_from_IMemAllocator(IMemAllocator * iface) +{ + return CONTAINING_RECORD(iface, StdMemAllocator, base.IMemAllocator_iface); +} + static HRESULT StdMemAllocator_Alloc(IMemAllocator * iface) { - StdMemAllocator *This = (StdMemAllocator *)iface; + StdMemAllocator *This = StdMemAllocator_from_IMemAllocator(iface); StdMediaSample2 * pSample = NULL; SYSTEM_INFO si; LONG i; @@ -849,7 +854,7 @@ static HRESULT StdMemAllocator_Alloc(IMemAllocator * iface) static HRESULT StdMemAllocator_Free(IMemAllocator * iface) { - StdMemAllocator *This = (StdMemAllocator *)iface; + StdMemAllocator *This = StdMemAllocator_from_IMemAllocator(iface); struct list * cursor; if (!list_empty(&This->base.used_list)) @@ -882,7 +887,7 @@ static HRESULT StdMemAllocator_Free(IMemAllocator * iface) static void StdMemAllocator_Destroy(IMemAllocator *iface) { - StdMemAllocator *This = (StdMemAllocator *)iface; + StdMemAllocator *This = StdMemAllocator_from_IMemAllocator(iface); This->csState.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csState);

1 0