May 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : winecfg: Replace the old DXGrab option by the new fullscreen grab option.
by Alexandre Julliard May 11, 2011

May 11, 2011

Module: wine Branch: master Commit: 687641c8f25ccbe8a6b8d0c904a7864dbf28ddb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=687641c8f25ccbe8a6b8d0c90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 11 14:49:07 2011 +0200 winecfg: Replace the old DXGrab option by the new fullscreen grab option. --- programs/winecfg/Bg.rc | 2 +- programs/winecfg/Cs.rc | 2 +- programs/winecfg/Da.rc | 2 +- programs/winecfg/De.rc | 2 +- programs/winecfg/En.rc | 2 +- programs/winecfg/Es.rc | 2 +- programs/winecfg/Fi.rc | 2 +- programs/winecfg/Fr.rc | 2 +- programs/winecfg/Hu.rc | 2 +- programs/winecfg/It.rc | 2 +- programs/winecfg/Ja.rc | 2 +- programs/winecfg/Ko.rc | 2 +- programs/winecfg/Lt.rc | 2 +- programs/winecfg/Nl.rc | 2 +- programs/winecfg/No.rc | 2 +- programs/winecfg/Pl.rc | 2 +- programs/winecfg/Pt.rc | 4 ++-- programs/winecfg/Ro.rc | 2 +- programs/winecfg/Ru.rc | 2 +- programs/winecfg/Si.rc | 2 +- programs/winecfg/Sr.rc | 2 +- programs/winecfg/Sv.rc | 2 +- programs/winecfg/Tr.rc | 2 +- programs/winecfg/Uk.rc | 2 +- programs/winecfg/Zh.rc | 4 ++-- programs/winecfg/resource.h | 2 +- programs/winecfg/x11drvdlg.c | 17 +++++++++-------- 27 files changed, 37 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=687641c8f25ccbe8a6b8d…

1 0

Henri Verbeet : wined3d: Remove object creation methods from the IWineD3DDevice interface.
by Alexandre Julliard May 11, 2011

May 11, 2011

1 0

Henri Verbeet : ddraw/tests: Add a small test for redundant mode setting calls.
by Alexandre Julliard May 11, 2011

May 11, 2011

Module: wine Branch: master Commit: 87b45c3545ec231d868ccdf26ec859751346f3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b45c3545ec231d868ccdf26… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 10 21:18:45 2011 +0200 ddraw/tests: Add a small test for redundant mode setting calls. --- dlls/ddraw/tests/d3d.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 7ad7492..e301fff 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3924,6 +3924,65 @@ static void test_window_style(void) DestroyWindow(window); } +static void test_redundant_mode_set(void) +{ + DDSURFACEDESC2 surface_desc = {0}; + IDirectDraw7 *ddraw7; + HWND window; + HRESULT hr; + RECT r, s; + ULONG ref; + + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); + if (FAILED(hr)) + { + skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); + return; + } + + window = CreateWindowA("static", "d3d7_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + DestroyWindow(window); + return; + } + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw7_GetDisplayMode(ddraw7, &surface_desc); + ok(SUCCEEDED(hr), "GetDipslayMode failed, hr %#x.\n", hr); + + hr = IDirectDraw7_SetDisplayMode(ddraw7, surface_desc.dwWidth, surface_desc.dwHeight, + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &r); + r.right /= 2; + r.bottom /= 2; + SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); + GetWindowRect(window, &s); + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + r.left, r.top, r.right, r.bottom, + s.left, s.top, s.right, s.bottom); + + hr = IDirectDraw7_SetDisplayMode(ddraw7, surface_desc.dwWidth, surface_desc.dwHeight, + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &s); + todo_wine ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + r.left, r.top, r.right, r.bottom, + s.left, s.top, s.right, s.bottom); + + ref = IDirectDraw7_Release(ddraw7); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} START_TEST(d3d) { init_function_pointers(); @@ -3966,4 +4025,5 @@ START_TEST(d3d) test_wndproc(); test_window_style(); + test_redundant_mode_set(); }

1 0

Henri Verbeet : wined3d: Set SFLAG_DYNLOCK for lockable render targets.
by Alexandre Julliard May 11, 2011

May 11, 2011

Module: wine Branch: master Commit: e6ab3832b20707108f8611a32ae61085ee4f76d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ab3832b20707108f8611a32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 10 21:18:44 2011 +0200 wined3d: Set SFLAG_DYNLOCK for lockable render targets. --- dlls/wined3d/surface.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ff84102..9891b96 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -7423,6 +7423,15 @@ HRESULT surface_init(struct wined3d_surface *surface, WINED3DSURFTYPE surface_ty surface->flags |= SFLAG_DISCARD; if (lockable || format_id == WINED3DFMT_D16_LOCKABLE) surface->flags |= SFLAG_LOCKABLE; + /* I'm not sure if this qualifies as a hack or as an optimization. It + * seems reasonable to assume that lockable render targets will get + * locked, so we might as well set SFLAG_DYNLOCK right at surface + * creation. However, the other reason we want to do this is that several + * ddraw applications access surface memory while the surface isn't + * mapped. The SFLAG_DYNLOCK behaviour of keeping SYSMEM around for + * future locks prevents these from crashing. */ + if (lockable && (usage & WINED3DUSAGE_RENDERTARGET)) + surface->flags |= SFLAG_DYNLOCK; /* Mark the texture as dirty so that it gets loaded first time around. */ surface_add_dirty_rect(surface, NULL);

1 0

Henri Verbeet : ddraw: Skip redundant mode setting calls.
by Alexandre Julliard May 11, 2011

May 11, 2011

Module: wine Branch: master Commit: 5e4145d0ffc9856d3aceb4f5260f233a18a1ee3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4145d0ffc9856d3aceb4f52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 10 21:18:46 2011 +0200 ddraw: Skip redundant mode setting calls. --- dlls/ddraw/ddraw.c | 34 ++++++++++++++++++++++++++-------- dlls/ddraw/tests/d3d.c | 2 +- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 9b87b95..fb032cb 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -830,6 +830,7 @@ static HRESULT WINAPI ddraw1_SetCooperativeLevel(IDirectDraw *iface, HWND window static HRESULT ddraw_set_display_mode(IDirectDrawImpl *ddraw, DWORD Width, DWORD Height, DWORD BPP, DWORD RefreshRate, DWORD Flags) { + enum wined3d_format_id format; WINED3DDISPLAYMODE Mode; HRESULT hr; @@ -845,6 +846,30 @@ static HRESULT ddraw_set_display_mode(IDirectDrawImpl *ddraw, DWORD Width, DWORD return DD_OK; } + switch(BPP) + { + case 8: format = WINED3DFMT_P8_UINT; break; + case 15: format = WINED3DFMT_B5G5R5X1_UNORM; break; + case 16: format = WINED3DFMT_B5G6R5_UNORM; break; + case 24: format = WINED3DFMT_B8G8R8_UNORM; break; + case 32: format = WINED3DFMT_B8G8R8X8_UNORM; break; + default: format = WINED3DFMT_UNKNOWN; break; + } + + if (FAILED(hr = IWineD3DDevice_GetDisplayMode(ddraw->wineD3DDevice, 0, &Mode))) + { + ERR("Failed to get current display mode, hr %#x.\n", hr); + } + else if (Mode.Width == Width + && Mode.Height == Height + && Mode.Format == format + && Mode.RefreshRate == RefreshRate) + { + TRACE("Skipping redundant mode setting call.\n"); + LeaveCriticalSection(&ddraw_cs); + return DD_OK; + } + /* Check the exclusive mode if(!(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) return DDERR_NOEXCLUSIVEMODE; @@ -857,14 +882,7 @@ static HRESULT ddraw_set_display_mode(IDirectDrawImpl *ddraw, DWORD Width, DWORD Mode.Width = Width; Mode.Height = Height; Mode.RefreshRate = RefreshRate; - switch(BPP) - { - case 8: Mode.Format = WINED3DFMT_P8_UINT; break; - case 15: Mode.Format = WINED3DFMT_B5G5R5X1_UNORM; break; - case 16: Mode.Format = WINED3DFMT_B5G6R5_UNORM; break; - case 24: Mode.Format = WINED3DFMT_B8G8R8_UNORM; break; - case 32: Mode.Format = WINED3DFMT_B8G8R8X8_UNORM; break; - } + Mode.Format = format; /* TODO: The possible return values from msdn suggest that * the screen mode can't be changed if a surface is locked diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index e301fff..6511a26 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3974,7 +3974,7 @@ static void test_redundant_mode_set(void) ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); GetWindowRect(window, &s); - todo_wine ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", r.left, r.top, r.right, r.bottom, s.left, s.top, s.right, s.bottom);

1 0

Dylan Smith : d3dx9: Implement D3DXMESHOPT_COMPACT for ID3DXMesh:: OptimizeInplace.
by Alexandre Julliard May 10, 2011

May 10, 2011

Module: wine Branch: master Commit: 61ba38635b7deb316fb569d6becebf605bcbd98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ba38635b7deb316fb569d6b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon May 9 06:30:51 2011 -0400 d3dx9: Implement D3DXMESHOPT_COMPACT for ID3DXMesh::OptimizeInplace. --- dlls/d3dx9_36/mesh.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 149 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index cfb19bc..eca9332 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -653,13 +653,159 @@ static HRESULT WINAPI ID3DXMeshImpl_Optimize(ID3DXMesh *iface, DWORD flags, CONS } static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flags, CONST DWORD *adjacency_in, DWORD *adjacency_out, - DWORD *face_remap, LPD3DXBUFFER *vertex_remap) + DWORD *face_remap_out, LPD3DXBUFFER *vertex_remap_out) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); + void *indices = NULL; + HRESULT hr; + ID3DXBuffer *vertex_remap = NULL; + DWORD *dword_indices = NULL; + DWORD new_num_vertices = 0; + DWORD new_vertex_buffer_size = 0; + IDirect3DVertexBuffer9 *vertex_buffer = NULL; + DWORD i; - FIXME("(%p)->(%u,%p,%p,%p,%p): stub\n", This, flags, adjacency_in, adjacency_out, face_remap, vertex_remap); + TRACE("(%p)->(%x,%p,%p,%p,%p)\n", This, flags, adjacency_in, adjacency_out, face_remap_out, vertex_remap_out); - return E_NOTIMPL; + if (!flags) + return D3DERR_INVALIDCALL; + if (!adjacency_in && (flags & (D3DXMESHOPT_VERTEXCACHE | D3DXMESHOPT_STRIPREORDER))) + return D3DERR_INVALIDCALL; + if ((flags & (D3DXMESHOPT_VERTEXCACHE | D3DXMESHOPT_STRIPREORDER)) == (D3DXMESHOPT_VERTEXCACHE | D3DXMESHOPT_STRIPREORDER)) + return D3DERR_INVALIDCALL; + + if (flags & (D3DXMESHOPT_ATTRSORT | D3DXMESHOPT_VERTEXCACHE | D3DXMESHOPT_STRIPREORDER)) + { + if (flags & D3DXMESHOPT_ATTRSORT) + FIXME("D3DXMESHOPT_ATTRSORT not implemented.\n"); + if (flags & D3DXMESHOPT_VERTEXCACHE) + FIXME("D3DXMESHOPT_VERTEXCACHE not implemented.\n"); + if (flags & D3DXMESHOPT_STRIPREORDER) + FIXME("D3DXMESHOPT_STRIPREORDER not implemented.\n"); + return E_NOTIMPL; + } + + hr = iface->lpVtbl->LockIndexBuffer(iface, 0, (void**)&indices); + if (FAILED(hr)) goto cleanup; + + dword_indices = HeapAlloc(GetProcessHeap(), 0, This->numfaces * 3 * sizeof(DWORD)); + if (!dword_indices) return E_OUTOFMEMORY; + if (This->options & D3DXMESH_32BIT) { + memcpy(dword_indices, indices, This->numfaces * 3 * sizeof(DWORD)); + } else { + WORD *word_indices = indices; + for (i = 0; i < This->numfaces * 3; i++) + dword_indices[i] = *word_indices++; + } + + if ((flags & (D3DXMESHOPT_COMPACT | D3DXMESHOPT_IGNOREVERTS)) == D3DXMESHOPT_COMPACT) + { + /* Remove unused vertices. */ + DWORD *vertex_remap_ptr; + + new_vertex_buffer_size = This->numvertices; + hr = D3DXCreateBuffer(This->numvertices * sizeof(DWORD), &vertex_remap); + if (FAILED(hr)) goto cleanup; + vertex_remap_ptr = ID3DXBuffer_GetBufferPointer(vertex_remap); + + for (i = 0; i < This->numfaces * 3; i++) + vertex_remap_ptr[dword_indices[i]] = 1; + + /* create old->new vertex mapping */ + for (i = 0; i < This->numvertices; i++) { + if (vertex_remap_ptr[i]) + vertex_remap_ptr[i] = new_num_vertices++; + else + vertex_remap_ptr[i] = -1; + } + /* convert indices */ + for (i = 0; i < This->numfaces * 3; i++) + dword_indices[i] = vertex_remap_ptr[dword_indices[i]]; + + /* create new->old vertex mapping */ + new_num_vertices = 0; + for (i = 0; i < This->numvertices; i++) { + if (vertex_remap_ptr[i] != -1) + vertex_remap_ptr[new_num_vertices++] = i; + } + for (i = new_num_vertices; i < This->numvertices; i++) + vertex_remap_ptr[i] = -1; + } + + if (vertex_remap) + { + /* reorder the vertices using vertex_remap */ + D3DVERTEXBUFFER_DESC vertex_desc; + DWORD *vertex_remap_ptr = ID3DXBuffer_GetBufferPointer(vertex_remap); + DWORD vertex_size = iface->lpVtbl->GetNumBytesPerVertex(iface); + BYTE *orig_vertices; + BYTE *new_vertices; + + hr = IDirect3DVertexBuffer9_GetDesc(This->vertex_buffer, &vertex_desc); + if (FAILED(hr)) goto cleanup; + + new_vertex_buffer_size *= vertex_size; + hr = IDirect3DDevice9_CreateVertexBuffer(This->device, new_vertex_buffer_size, + vertex_desc.Usage, This->fvf, vertex_desc.Pool, &vertex_buffer, NULL); + if (FAILED(hr)) goto cleanup; + + hr = IDirect3DVertexBuffer9_Lock(This->vertex_buffer, 0, 0, (void**)&orig_vertices, D3DLOCK_READONLY); + if (FAILED(hr)) goto cleanup; + + hr = IDirect3DVertexBuffer9_Lock(vertex_buffer, 0, 0, (void**)&new_vertices, D3DLOCK_DISCARD); + if (FAILED(hr)) { + IDirect3DVertexBuffer9_Unlock(This->vertex_buffer); + goto cleanup; + } + + for (i = 0; i < new_num_vertices; i++) + memcpy(new_vertices + i * vertex_size, orig_vertices + vertex_remap_ptr[i] * vertex_size, vertex_size); + + IDirect3DVertexBuffer9_Unlock(This->vertex_buffer); + IDirect3DVertexBuffer9_Unlock(vertex_buffer); + } else if (vertex_remap_out) { + DWORD *vertex_remap_ptr; + + hr = D3DXCreateBuffer(This->numvertices * sizeof(DWORD), &vertex_remap); + if (FAILED(hr)) goto cleanup; + vertex_remap_ptr = ID3DXBuffer_GetBufferPointer(vertex_remap); + for (i = 0; i < This->numvertices; i++) + *vertex_remap_ptr++ = i; + } + + if (This->options & D3DXMESH_32BIT) { + memcpy(indices, dword_indices, This->numfaces * 3 * sizeof(DWORD)); + } else { + WORD *word_indices = indices; + for (i = 0; i < This->numfaces * 3; i++) + *word_indices++ = dword_indices[i]; + } + + if (adjacency_out) { + memcpy(adjacency_out, adjacency_in, This->numfaces * 3 * sizeof(*adjacency_out)); + } + if (face_remap_out) { + for (i = 0; i < This->numfaces; i++) + face_remap_out[i] = i; + } + if (vertex_remap_out) + *vertex_remap_out = vertex_remap; + vertex_remap = NULL; + + if (vertex_buffer) { + IDirect3DVertexBuffer9_Release(This->vertex_buffer); + This->vertex_buffer = vertex_buffer; + vertex_buffer = NULL; + This->numvertices = new_num_vertices; + } + + hr = D3D_OK; +cleanup: + HeapFree(GetProcessHeap(), 0, dword_indices); + if (vertex_remap) ID3DXBuffer_Release(vertex_remap); + if (vertex_buffer) IDirect3DVertexBuffer9_Release(vertex_buffer); + if (indices) iface->lpVtbl->UnlockIndexBuffer(iface); + return hr; } static HRESULT WINAPI ID3DXMeshImpl_SetAttributeTable(ID3DXMesh *iface, CONST D3DXATTRIBUTERANGE *attrib_table, DWORD attrib_table_size)

1 0

André Hentschel : kernel32: Forward registry functions to advapi32.
by Alexandre Julliard May 10, 2011

May 10, 2011

Module: wine Branch: master Commit: 28c8e228f52bc6a6bebe94e90b573a315d48a148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c8e228f52bc6a6bebe94e90… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 9 22:29:41 2011 +0200 kernel32: Forward registry functions to advapi32. --- dlls/kernel32/kernel32.spec | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2ac24b4..01939c9 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -914,6 +914,48 @@ @ stdcall ReadFileEx(long ptr long ptr ptr) @ stdcall ReadFileScatter(long ptr long ptr ptr) @ stdcall ReadProcessMemory(long ptr ptr long ptr) +@ stdcall RegCloseKey(long) advapi32.RegCloseKey +@ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExA +@ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExW +@ stdcall RegDeleteKeyExA(long str long long) advapi32.RegDeleteKeyExA +@ stdcall RegDeleteKeyExW(long wstr long long) advapi32.RegDeleteKeyExW +@ stdcall RegDeleteTreeA(long str) advapi32.RegDeleteTreeA +@ stdcall RegDeleteTreeW(long wstr) advapi32.RegDeleteTreeW +@ stdcall RegDeleteValueA(long str) advapi32.RegDeleteValueA +@ stdcall RegDeleteValueW(long wstr) advapi32.RegDeleteValueW +# stub RegDisablePredefinedCacheEx +@ stdcall RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExA +@ stdcall RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExW +@ stdcall RegEnumValueA(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueA +@ stdcall RegEnumValueW(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueW +@ stdcall RegFlushKey(long) advapi32.RegFlushKey +@ stdcall RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity +@ stdcall RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA +@ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW +# stub RegKrnGetGlobalState +# stub RegKrnInitialize +@ stdcall RegLoadKeyA(long str str) advapi32.RegLoadKeyA +@ stdcall RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW +@ stdcall RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA +@ stdcall RegLoadMUIStringW(long wstr wstr long ptr long wstr) advapi32.RegLoadMUIStringW +@ stdcall RegNotifyChangeKeyValue(long long long long long) advapi32.RegNotifyChangeKeyValue +@ stdcall RegOpenCurrentUser(long ptr) advapi32.RegOpenCurrentUser +@ stdcall RegOpenKeyExA(long str long long ptr) advapi32.RegOpenKeyExA +@ stdcall RegOpenKeyExW(long wstr long long ptr) advapi32.RegOpenKeyExW +@ stdcall RegOpenUserClassesRoot(ptr long long ptr) advapi32.RegOpenUserClassesRoot +@ stdcall RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyA +@ stdcall RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyW +@ stdcall RegQueryValueExA(long str ptr ptr ptr ptr) advapi32.RegQueryValueExA +@ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) advapi32.RegQueryValueExW +@ stdcall RegRestoreKeyA(long str long) advapi32.RegRestoreKeyA +@ stdcall RegRestoreKeyW(long wstr long) advapi32.RegRestoreKeyW +# stub RegSaveKeyExA +# stub RegSaveKeyExW +@ stdcall RegSetKeySecurity(long long ptr) advapi32.RegSetKeySecurity +@ stdcall RegSetValueExA(long str long long ptr long) advapi32.RegSetValueExA +@ stdcall RegSetValueExW(long wstr long long ptr long) advapi32.RegSetValueExW +@ stdcall RegUnLoadKeyA(long str) advapi32.RegUnLoadKeyA +@ stdcall RegUnLoadKeyW(long wstr) advapi32.RegUnLoadKeyW @ stdcall RegisterApplicationRestart(wstr long) @ stub RegisterConsoleIME @ stub RegisterConsoleOS2

1 0

Jacek Caban : wininet: Added support for persistent HTTP connections.
by Alexandre Julliard May 10, 2011

May 10, 2011

Module: wine Branch: master Commit: 8a1df203ae347946936d2677154939b1fa9dde3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a1df203ae347946936d26771… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 10 09:26:43 2011 +0000 wininet: Added support for persistent HTTP connections. --- dlls/urlmon/tests/protocol.c | 2 +- dlls/urlmon/tests/url.c | 26 +- dlls/wininet/http.c | 680 ++++++++++++++++++++++++++---------------- dlls/wininet/internet.c | 2 +- dlls/wininet/internet.h | 43 ++- dlls/wininet/netconnection.c | 168 +++++------ dlls/wininet/tests/http.c | 32 +-- 7 files changed, 546 insertions(+), 407 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a1df203ae347946936d2…

1 0

Austin English : dsound: Return success in IDirectSoundBufferImpl_AcquireResources.
by Alexandre Julliard May 10, 2011

May 10, 2011

Module: wine Branch: master Commit: 6a3255bbbde0bdec3407ea89ef640b66dc45773c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a3255bbbde0bdec3407ea89e… Author: Austin English <austinenglish(a)gmail.com> Date: Mon May 9 17:59:02 2011 -0500 dsound: Return success in IDirectSoundBufferImpl_AcquireResources. --- dlls/dsound/buffer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 0e9096a..f797baf 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -791,13 +791,13 @@ static HRESULT WINAPI IDirectSoundBufferImpl_AcquireResources( IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; DWORD u; - FIXME("(%p,%08u,%u,%p): stub\n",This,dwFlags,dwEffectsCount,pdwResultCodes); + FIXME("(%p,%08u,%u,%p): stub, faking success\n",This,dwFlags,dwEffectsCount,pdwResultCodes); if (pdwResultCodes) for (u=0; u<dwEffectsCount; u++) pdwResultCodes[u] = DSFXR_UNKNOWN; WARN("control unavailable\n"); - return DSERR_CONTROLUNAVAIL; + return DS_OK; } static HRESULT WINAPI IDirectSoundBufferImpl_GetObjectInPath(

1 0

Marcus Meissner : krnl386.exe16: Fixed get selector bit logic (Coverity).
by Alexandre Julliard May 10, 2011

May 10, 2011

Module: wine Branch: master Commit: bb6c1f06af293eb2476f4d5db00e6a6746927276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6c1f06af293eb2476f4d5db… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue May 10 16:48:06 2011 +0200 krnl386.exe16: Fixed get selector bit logic (Coverity). --- dlls/krnl386.exe16/selector.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/selector.c b/dlls/krnl386.exe16/selector.c index ec9bb2a..5a99f72 100644 --- a/dlls/krnl386.exe16/selector.c +++ b/dlls/krnl386.exe16/selector.c @@ -297,7 +297,7 @@ WORD WINAPI SelectorAccessRights16( WORD sel, WORD op, WORD val ) if (op == 0) /* get */ { - return entry.HighWord.Bytes.Flags1 | ((entry.HighWord.Bytes.Flags2 << 8) & 0xf0); + return entry.HighWord.Bytes.Flags1 | ((entry.HighWord.Bytes.Flags2 & 0xf0) << 8); } else /* set */ {

1 0