November 2010 - Wine-commits

Hans Leidekker : ntdll: Add a stub implementation of FSCTL_GET_RETRIEVAL_POINTERS.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 63c19ab495ae31b83ad5d86a8fe9e54a09735c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63c19ab495ae31b83ad5d86a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sat Nov 20 15:48:02 2010 +0100 ntdll: Add a stub implementation of FSCTL_GET_RETRIEVAL_POINTERS. --- dlls/ntdll/file.c | 22 ++++++++++++++++++++++ include/winioctl.h | 9 +++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3dc5358..68bed0e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1495,6 +1495,28 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc status = STATUS_SUCCESS; break; + case FSCTL_GET_RETRIEVAL_POINTERS: + { + RETRIEVAL_POINTERS_BUFFER *buffer = (RETRIEVAL_POINTERS_BUFFER *)out_buffer; + + FIXME("stub: FSCTL_GET_RETRIEVAL_POINTERS\n"); + + if (out_size >= sizeof(RETRIEVAL_POINTERS_BUFFER)) + { + buffer->ExtentCount = 1; + buffer->StartingVcn.QuadPart = 1; + buffer->Extents[0].NextVcn.QuadPart = 0; + buffer->Extents[0].Lcn.QuadPart = 0; + io->Information = sizeof(RETRIEVAL_POINTERS_BUFFER); + status = STATUS_SUCCESS; + } + else + { + io->Information = 0; + status = STATUS_BUFFER_TOO_SMALL; + } + break; + } case FSCTL_PIPE_LISTEN: case FSCTL_PIPE_WAIT: default: diff --git a/include/winioctl.h b/include/winioctl.h index 8765cdf..d1c3376 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -376,6 +376,15 @@ typedef struct _VOLUME_DISK_EXTENTS { DISK_EXTENT Extents[1]; } VOLUME_DISK_EXTENTS; +typedef struct RETRIEVAL_POINTERS_BUFFER { + DWORD ExtentCount; + LARGE_INTEGER StartingVcn; + struct { + LARGE_INTEGER NextVcn; + LARGE_INTEGER Lcn; + } Extents[1]; +} RETRIEVAL_POINTERS_BUFFER, *PRETRIEVAL_POINTERS_BUFFER; + /* End: _WIN32_WINNT >= 0x0400 */ /*

1 0

Yaron Shahrabani : serialui: Added Hebrew translation.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 563dec8b2ee6d08f21105581bd32471dd6cbd20e URL: http://source.winehq.org/git/wine.git/?a=commit;h=563dec8b2ee6d08f21105581b… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Mon Nov 15 23:00:02 2010 +0200 serialui: Added Hebrew translation. --- dlls/serialui/He.rc | 47 +++++++++++++++++++++++++++++++++++++++++++++ dlls/serialui/Makefile.in | 1 + 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/serialui/He.rc b/dlls/serialui/He.rc new file mode 100644 index 0000000..e106165 --- /dev/null +++ b/dlls/serialui/He.rc @@ -0,0 +1,47 @@ +/* + * Copyright 2000 Mike McCormack + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * 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 "serialui.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_SERIALUICONFIG DIALOG 0, 0, 160, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "מאפיינים עבור " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "קצב שידור", -1,5,20,55,10 + COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "זוגיות", -1,5,40,55,10 + COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "בקרת ציפה", -1,5,60,55,10 + COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "סיביות נתונים", -1,5,80,55,10 + COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "סיביות עצירה", -1,5,100,55,10 + COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "אישור", IDOK,30,138,50,14 + PUSHBUTTON "ביטול", IDCANCEL,85,138,50,14 + /* these two buttons are for testing Get/SetDefaultCommConfig */ + /* PUSHBUTTON "GetDefault", ID_GETDEFAULT,30,115,50,14 */ + /* PUSHBUTTON "SetDefault", ID_SETDEFAULT,85,115,50,14 */ +END diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in index 1812296..ddf8460 100644 --- a/dlls/serialui/Makefile.in +++ b/dlls/serialui/Makefile.in @@ -15,6 +15,7 @@ RC_SRCS = \ Es.rc \ Fi.rc \ Fr.rc \ + He.rc \ Hu.rc \ It.rc \ Ja.rc \

1 0

Luca Bennati : xcopy: Fix Italian translation.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 1c24b643fff703ca6b4ae8d1f2efef0ff0a802ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c24b643fff703ca6b4ae8d1f… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Nov 20 21:26:58 2010 +0100 xcopy: Fix Italian translation. --- programs/xcopy/It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/It.rc b/programs/xcopy/It.rc index 2978c0d..2a1cae9 100644 --- a/programs/xcopy/It.rc +++ b/programs/xcopy/It.rc @@ -34,7 +34,7 @@ STRINGTABLE STRING_SIMCOPY, "%d file saranno copiati\n" STRING_COPY, "%d file copiato/i\n" STRING_QISDIR, "'%s' è il nome di un file o una cartella\n\ - nell'obiettivo?\n\ + nella destinazione?\n\ (F - File, C - Cartella)\n" STRING_SRCPROMPT,"%s? (Sì|No)\n" STRING_OVERWRITE,"Sovrascrivere %s? (Sì|No|Tutti)\n"

1 0

Austin English : wined3d: Add detection for Nvidia GT 330.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 90f428cd85a1e1c8b62c702afe88a8f6d18cb1d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f428cd85a1e1c8b62c702af… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 22 23:21:37 2010 +0000 wined3d: Add detection for Nvidia GT 330. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9a9753e..cfdf3f5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1081,6 +1081,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", DRIVER_NVIDIA_GEFORCE6, 896 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT330, "NVIDIA GeForce GT 330", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS350M, "NVIDIA GeForce GTS 350M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX460, "NVIDIA GeForce GTX 460", DRIVER_NVIDIA_GEFORCE6, 768 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX465, "NVIDIA GeForce GTX 465", DRIVER_NVIDIA_GEFORCE6, 1024}, @@ -1421,6 +1422,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GTX 470", CARD_NVIDIA_GEFORCE_GTX470}, /* Geforce 400 - midend high */ {"GTX 465", CARD_NVIDIA_GEFORCE_GTX465}, /* Geforce 400 - midend */ {"GTX 460", CARD_NVIDIA_GEFORCE_GTX460}, /* Geforce 400 - midend */ + {"GT 330", CARD_NVIDIA_GEFORCE_GT330}, /* Geforce 300 - highend */ {"GTS 360M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ {"GTS 350M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ {"GT 330M", CARD_NVIDIA_GEFORCE_GT325M}, /* Geforce 300 - midend mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6d472a9..63eec76 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1396,6 +1396,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1, CARD_NVIDIA_GEFORCE_GT325M = 0x0a35, + CARD_NVIDIA_GEFORCE_GT330 = 0x0ca0, CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0, CARD_NVIDIA_GEFORCE_GTX460 = 0x0e22, CARD_NVIDIA_GEFORCE_GTX465 = 0x06c4,

1 0

Henri Verbeet : d3d9/tests: Use GetRenderTargetData() for reading back pixels.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 27b72fa84761fe738f693e1beb5bba50879afbea URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b72fa84761fe738f693e1be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 18 20:50:38 2010 +0100 d3d9/tests: Use GetRenderTargetData() for reading back pixels. This is the recommended way to read back render targets. It's also much faster on current wined3d, but that's mostly a side effect of imperfections in our resource location management. --- dlls/d3d9/tests/visual.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f2eb4b4..d2c5df5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -110,8 +110,9 @@ static DWORD getPixelColor(IDirect3DDevice9 *device, UINT x, UINT y) D3DLOCKED_RECT lockedRect; RECT rectToLock = {x, y, x+1, y+1}; - hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, 0, 0, TRUE, &surf, NULL); - if(FAILED(hr) || !surf ) /* This is not a test */ + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 640, 480, + D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surf, NULL); + if (FAILED(hr) || !surf) { trace("Can't create an offscreen plain surface to read the render target data, hr=%08x\n", hr); return 0xdeadbeef; @@ -125,8 +126,8 @@ static DWORD getPixelColor(IDirect3DDevice9 *device, UINT x, UINT y) goto out; } - hr = IDirect3DDevice9_StretchRect(device, target, NULL, surf, NULL, D3DTEXF_POINT); - if(FAILED(hr)) + hr = IDirect3DDevice9_GetRenderTargetData(device, target, surf); + if (FAILED(hr)) { trace("Can't read the render target data, hr=%08x\n", hr); ret = 0xdeadbeec;

1 0

Henri Verbeet : wined3d: Textures never have a resource size.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: b459b917fb211d8e39f731b1e522b34da1a86d47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b459b917fb211d8e39f731b1e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 18 20:50:39 2010 +0100 wined3d: Textures never have a resource size. They're just containers for their subresources. --- dlls/wined3d/basetexture.c | 4 ++-- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 5b1a85b..83f3797 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -28,14 +28,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT layer_count, UINT level_count, - WINED3DRESOURCETYPE resource_type, IWineD3DDeviceImpl *device, UINT size, DWORD usage, + WINED3DRESOURCETYPE resource_type, IWineD3DDeviceImpl *device, DWORD usage, const struct wined3d_format *format, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) { HRESULT hr; hr = resource_init((IWineD3DResource *)texture, resource_type, device, - size, usage, format, pool, parent, parent_ops); + 0, usage, format, pool, parent, parent_ops); if (FAILED(hr)) { WARN("Failed to initialize resource, returning %#x\n", hr); diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 4881ac1..a31d59c 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -500,7 +500,7 @@ HRESULT cubetexture_init(IWineD3DCubeTextureImpl *texture, UINT edge_length, UIN texture->lpVtbl = &IWineD3DCubeTexture_Vtbl; hr = basetexture_init((IWineD3DBaseTextureImpl *)texture, 6, levels, - WINED3DRTYPE_CUBETEXTURE, device, 0, usage, format, pool, parent, parent_ops); + WINED3DRTYPE_CUBETEXTURE, device, usage, format, pool, parent, parent_ops); if (FAILED(hr)) { WARN("Failed to initialize basetexture, returning %#x\n", hr); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c5ec40f..1013647 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -532,7 +532,7 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT texture->lpVtbl = &IWineD3DTexture_Vtbl; hr = basetexture_init((IWineD3DBaseTextureImpl *)texture, 1, levels, - WINED3DRTYPE_TEXTURE, device, 0, usage, format, pool, parent, parent_ops); + WINED3DRTYPE_TEXTURE, device, usage, format, pool, parent, parent_ops); if (FAILED(hr)) { WARN("Failed to initialize basetexture, returning %#x.\n", hr); diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index bfe1fba..13a7db1 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -430,7 +430,7 @@ HRESULT volumetexture_init(IWineD3DVolumeTextureImpl *texture, UINT width, UINT texture->lpVtbl = &IWineD3DVolumeTexture_Vtbl; hr = basetexture_init((IWineD3DBaseTextureImpl *)texture, 1, levels, - WINED3DRTYPE_VOLUMETEXTURE, device, 0, usage, format, pool, parent, parent_ops); + WINED3DRTYPE_VOLUMETEXTURE, device, usage, format, pool, parent, parent_ops); if (FAILED(hr)) { WARN("Failed to initialize basetexture, returning %#x.\n", hr); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2278cb7..6614c31 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1936,7 +1936,7 @@ DWORD basetexture_get_lod(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; IWineD3DResourceImpl *basetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture, UINT sub_resource_idx) DECLSPEC_HIDDEN; HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT layer_count, UINT level_count, - WINED3DRESOURCETYPE resource_type, IWineD3DDeviceImpl *device, UINT size, DWORD usage, + WINED3DRESOURCETYPE resource_type, IWineD3DDeviceImpl *device, DWORD usage, const struct wined3d_format *format, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTexture *iface,

1 0

Henri Verbeet : wined3d: Get rid of the remaining "Flags".
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 03f7a2d88ea1cda4b4ca3ea1aa97a2a373e4cfd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f7a2d88ea1cda4b4ca3ea1a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 18 20:50:40 2010 +0100 wined3d: Get rid of the remaining "Flags". --- dlls/wined3d/clipper.c | 12 ++-- dlls/wined3d/cubetexture.c | 8 ++- dlls/wined3d/device.c | 40 ++++++----- dlls/wined3d/directx.c | 9 ++- dlls/wined3d/palette.c | 21 ++++-- dlls/wined3d/query.c | 42 +++++++----- dlls/wined3d/resource.c | 16 +++-- dlls/wined3d/surface.c | 97 ++++++++++++++------------- dlls/wined3d/surface_base.c | 141 ++++++++++++++++++++++------------------ dlls/wined3d/surface_gdi.c | 9 +-- dlls/wined3d/swapchain.c | 5 +- dlls/wined3d/swapchain_base.c | 9 ++- dlls/wined3d/swapchain_gdi.c | 5 +- dlls/wined3d/texture.c | 8 ++- dlls/wined3d/volume.c | 15 ++-- dlls/wined3d/volumetexture.c | 8 ++- dlls/wined3d/wined3d_private.h | 16 ++-- 17 files changed, 255 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03f7a2d88ea1cda4b4ca3…

1 0

Henri Verbeet : wined3d: Fix the indentation in buffer_direct_upload().
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: a147fd9c36c49aaa08bb2b32778f7960ea6509a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a147fd9c36c49aaa08bb2b327… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 18 20:50:41 2010 +0100 wined3d: Fix the indentation in buffer_direct_upload(). --- dlls/wined3d/buffer.c | 110 +++++++++++++++++++++++++----------------------- 1 files changed, 57 insertions(+), 53 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 7400fd8..09c07fe 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -863,71 +863,75 @@ drop_query: /* The caller provides a GL context */ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info, DWORD flags) { - BYTE *map; - UINT start = 0, len = 0; + BYTE *map; + UINT start = 0, len = 0; - ENTER_GL(); - GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); - checkGLcall("glBindBufferARB"); - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + ENTER_GL(); + + /* This potentially invalidates the element array buffer binding, but the + * caller always takes care of this. */ + GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); + checkGLcall("glBindBufferARB"); + if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + { + GLbitfield mapflags; + mapflags = GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; + if (flags & WINED3D_BUFFER_DISCARD) { - GLbitfield mapflags; - mapflags = GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; - if (flags & WINED3D_BUFFER_DISCARD) - { - mapflags |= GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_INVALIDATE_BUFFER_BIT; - } - else if (flags & WINED3D_BUFFER_NOSYNC) - { - mapflags |= GL_MAP_UNSYNCHRONIZED_BIT; - } - map = GL_EXTCALL(glMapBufferRange(This->buffer_type_hint, 0, - This->resource.size, mapflags)); - checkGLcall("glMapBufferRange"); + mapflags |= GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_INVALIDATE_BUFFER_BIT; } - else + else if (flags & WINED3D_BUFFER_NOSYNC) { - if (This->flags & WINED3D_BUFFER_APPLESYNC) - { - DWORD syncflags = 0; - if (flags & WINED3D_BUFFER_DISCARD) syncflags |= WINED3DLOCK_DISCARD; - if (flags & WINED3D_BUFFER_NOSYNC) syncflags |= WINED3DLOCK_NOOVERWRITE; - LEAVE_GL(); - buffer_sync_apple(This, syncflags, gl_info); - ENTER_GL(); - } - map = GL_EXTCALL(glMapBufferARB(This->buffer_type_hint, GL_WRITE_ONLY_ARB)); - checkGLcall("glMapBufferARB"); + mapflags |= GL_MAP_UNSYNCHRONIZED_BIT; } - if (!map) + map = GL_EXTCALL(glMapBufferRange(This->buffer_type_hint, 0, + This->resource.size, mapflags)); + checkGLcall("glMapBufferRange"); + } + else + { + if (This->flags & WINED3D_BUFFER_APPLESYNC) { + DWORD syncflags = 0; + if (flags & WINED3D_BUFFER_DISCARD) syncflags |= WINED3DLOCK_DISCARD; + if (flags & WINED3D_BUFFER_NOSYNC) syncflags |= WINED3DLOCK_NOOVERWRITE; LEAVE_GL(); - ERR("Failed to map opengl buffer\n"); - return; + buffer_sync_apple(This, syncflags, gl_info); + ENTER_GL(); } + map = GL_EXTCALL(glMapBufferARB(This->buffer_type_hint, GL_WRITE_ONLY_ARB)); + checkGLcall("glMapBufferARB"); + } + if (!map) + { + LEAVE_GL(); + ERR("Failed to map opengl buffer\n"); + return; + } - while(This->modified_areas) - { - This->modified_areas--; - start = This->maps[This->modified_areas].offset; - len = This->maps[This->modified_areas].size; + while (This->modified_areas) + { + This->modified_areas--; + start = This->maps[This->modified_areas].offset; + len = This->maps[This->modified_areas].size; - memcpy(map + start, This->resource.allocatedMemory + start, len); + memcpy(map + start, This->resource.allocatedMemory + start, len); - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) - { - GL_EXTCALL(glFlushMappedBufferRange(This->buffer_type_hint, start, len)); - checkGLcall("glFlushMappedBufferRange"); - } - else if (This->flags & WINED3D_BUFFER_FLUSH) - { - GL_EXTCALL(glFlushMappedBufferRangeAPPLE(This->buffer_type_hint, start, len)); - checkGLcall("glFlushMappedBufferRangeAPPLE"); - } + if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + { + GL_EXTCALL(glFlushMappedBufferRange(This->buffer_type_hint, start, len)); + checkGLcall("glFlushMappedBufferRange"); } - GL_EXTCALL(glUnmapBufferARB(This->buffer_type_hint)); - checkGLcall("glUnmapBufferARB"); - LEAVE_GL(); + else if (This->flags & WINED3D_BUFFER_FLUSH) + { + GL_EXTCALL(glFlushMappedBufferRangeAPPLE(This->buffer_type_hint, start, len)); + checkGLcall("glFlushMappedBufferRangeAPPLE"); + } + } + GL_EXTCALL(glUnmapBufferARB(This->buffer_type_hint)); + checkGLcall("glUnmapBufferARB"); + + LEAVE_GL(); } /* Do not call while under the GL lock. */

1 0

André Hentschel : ws2_32: Map AI_ADDRCONFIG.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 8b913427c0798a04ba3f99d8bf1bb5ae38b30310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b913427c0798a04ba3f99d8b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 18 20:46:49 2010 +0100 ws2_32: Map AI_ADDRCONFIG. --- dlls/ws2_32/socket.c | 4 +--- include/ws2tcpip.h | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index cb58015..0bc773e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -430,9 +430,7 @@ static const int ws_aiflag_map[][2] = MAP_OPTION( AI_PASSIVE ), MAP_OPTION( AI_CANONNAME ), MAP_OPTION( AI_NUMERICHOST ), - /* Linux/UNIX knows a lot more. But Windows only - * has 3 as far as I could see. -Marcus - */ + MAP_OPTION( AI_ADDRCONFIG ), }; static const int ws_niflag_map[][2] = diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 0461a81..b1c296c 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -60,9 +60,13 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; /* Possible Windows flags for getaddrinfo() */ #ifndef USE_WS_PREFIX -# define AI_PASSIVE 0x0001 -# define AI_CANONNAME 0x0002 -# define AI_NUMERICHOST 0x0004 +# define AI_PASSIVE 0x00000001 +# define AI_CANONNAME 0x00000002 +# define AI_NUMERICHOST 0x00000004 +# define AI_ADDRCONFIG 0x00000400 +# define AI_NON_AUTHORITATIVE 0x00004000 +# define AI_SECURE 0x00008000 +# define AI_RETURN_PREFERRED_NAMES 0x00010000 /* getaddrinfo error codes */ # define EAI_AGAIN WSATRY_AGAIN # define EAI_BADFLAGS WSAEINVAL @@ -74,9 +78,13 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; # define EAI_SERVICE WSATYPE_NOT_FOUND # define EAI_SOCKTYPE WSAESOCKTNOSUPPORT #else -# define WS_AI_PASSIVE 0x0001 -# define WS_AI_CANONNAME 0x0002 -# define WS_AI_NUMERICHOST 0x0004 +# define WS_AI_PASSIVE 0x00000001 +# define WS_AI_CANONNAME 0x00000002 +# define WS_AI_NUMERICHOST 0x00000004 +# define WS_AI_ADDRCONFIG 0x00000400 +# define WS_AI_NON_AUTHORITATIVE 0x00004000 +# define WS_AI_SECURE 0x00008000 +# define WS_AI_RETURN_PREFERRED_NAMES 0x00010000 /* getaddrinfo error codes */ # define WS_EAI_AGAIN WSATRY_AGAIN # define WS_EAI_BADFLAGS WSAEINVAL

1 0

David Hedberg : ole32: Avoid unneccessary stream conversion.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 41193de1354b6ecbdde68d034be94b97b5a43c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41193de1354b6ecbdde68d034… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Thu Nov 18 21:57:16 2010 +0100 ole32: Avoid unneccessary stream conversion. Truncating a large stream to less than 0x1000 bytes would cause an unnecessarily expensive conversion. --- dlls/ole32/storage32.c | 14 ++++++++------ dlls/ole32/storage32.h | 3 ++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 2d62956..8cf3f02 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2489,7 +2489,7 @@ static HRESULT StorageImpl_StreamSetSize(StorageBaseImpl *base, DirRef index, } else if (bigblock && newsize.QuadPart < LIMIT_TO_USE_SMALL_BLOCK) { - smallblock = Storage32Impl_BigBlocksToSmallBlocks(This, pbigblock); + smallblock = Storage32Impl_BigBlocksToSmallBlocks(This, pbigblock, newsize); if (!smallblock) return E_FAIL; } @@ -4132,12 +4132,13 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( */ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( StorageImpl* This, - BlockChainStream** ppbbChain) + BlockChainStream** ppbbChain, + ULARGE_INTEGER newSize) { ULARGE_INTEGER size, offset, cbTotalRead; ULONG cbRead, cbWritten, sbHeadOfChain = BLOCK_END_OF_CHAIN; DirRef streamEntryRef; - HRESULT resWrite = S_OK, resRead; + HRESULT resWrite = S_OK, resRead = S_OK; DirEntry streamEntry; BYTE* buffer; SmallBlockChainStream* sbTempChain; @@ -4150,14 +4151,15 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( if(!sbTempChain) return NULL; + SmallBlockChainStream_SetSize(sbTempChain, newSize); size = BlockChainStream_GetSize(*ppbbChain); - SmallBlockChainStream_SetSize(sbTempChain, size); + size.QuadPart = min(size.QuadPart, newSize.QuadPart); offset.u.HighPart = 0; offset.u.LowPart = 0; cbTotalRead.QuadPart = 0; buffer = HeapAlloc(GetProcessHeap(), 0, This->bigBlockSize); - do + while(cbTotalRead.QuadPart < size.QuadPart) { resRead = BlockChainStream_ReadAt(*ppbbChain, offset, min(This->bigBlockSize, size.u.LowPart - offset.u.LowPart), @@ -4183,7 +4185,7 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( resRead = STG_E_READFAULT; break; } - }while(cbTotalRead.QuadPart < size.QuadPart); + } HeapFree(GetProcessHeap(), 0, buffer); size.u.HighPart = 0; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 0f8b3b4..1aee587 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -412,7 +412,8 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( StorageImpl* This, - BlockChainStream** ppbbChain); + BlockChainStream** ppbbChain, + ULARGE_INTEGER newSize); /**************************************************************************** * StgStreamImpl definitions.

1 0