January 2009 - Wine-Commits

Anders Jonsson : winefile: Update Swedish translation.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 2ce82aec19167d12cfd5c0570cdfd12c4f602d4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce82aec19167d12cfd5c0570… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Fri Jan 23 10:17:44 2009 +0100 winefile: Update Swedish translation. --- programs/winefile/Sv.rc | 60 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 57 insertions(+), 3 deletions(-) diff --git a/programs/winefile/Sv.rc b/programs/winefile/Sv.rc index 78b6065..6905c5e 100644 --- a/programs/winefile/Sv.rc +++ b/programs/winefile/Sv.rc @@ -4,6 +4,7 @@ * * Copyright 2005 David Nordenberg * Copyright 2008 Daniel Nylander <po(a)danielnylander.se> + * Copyright 2009 Anders Jonsson * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -125,7 +126,7 @@ IDM_WINEFILE MENU FIXED IMPURE POPUP "&F�nster" { MENUITEM "Nytt &f�nster", ID_WINDOW_NEW MENUITEM "�verlappande\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ + MENUITEM "Ordna &horisontellt", ID_WINDOW_TILE_HORZ MENUITEM "Ordna &vertikalt\tCtrl+F4", ID_WINDOW_TILE_VERT #ifndef _NO_EXTENSIONS MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT @@ -171,10 +172,63 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Bl�ddra", 254, 158, 43, 47, 14 } +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Efter filtyp" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Namn:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "Filtyp",-1,7,23,87,56 + CONTROL "&Kataloger",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Program",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "&Dokument",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Andra filer",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "Visa g�mda/&system-filer",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Egenskaper f�r %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,191,29,50,14 + LTEXT "&Filnamn:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "F&ull s�kv�g:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Sist �ndrad:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Version:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Cop&yright:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Storlek:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Attribut",-1,7,79,158,46 + CONTROL "Sk&rivskyddad",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "&Dold",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Arkiv",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&System",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "&Komprimerad",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&Versionsinfo",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + STRINGTABLE { IDS_FONT_SEL_DLG_NAME "Verkst�ll teckensnittsinst�llningar" - IDS_FONT_SEL_ERROR "Ett fel uppstog n�r ett nytt teckensnitt valdes." + IDS_FONT_SEL_ERROR "Ett fel uppstod n�r ett nytt teckensnitt valdes." } STRINGTABLE @@ -187,7 +241,7 @@ STRINGTABLE IDS_SHELL "Skal" IDS_TITLEFMT "%s - %s" IDS_NO_IMPL "Inte implementerat �nnu" - IDS_WINE_FILE "Wine File" + IDS_WINE_FILE "Winefile" } STRINGTABLE

1 0

Henri Verbeet : wined3d: Take EXT_vertex_array_bgra into account in send_attribute() and loadNumberedArrays().
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: e82eef28f93cc4e4c89660c47d949cb0f3949b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e82eef28f93cc4e4c89660c47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 23 10:22:33 2009 +0100 wined3d: Take EXT_vertex_array_bgra into account in send_attribute() and loadNumberedArrays(). --- dlls/wined3d/drawprim.c | 12 +++++++++++- dlls/wined3d/state.c | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 929565f..c9a8f4a 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -534,8 +534,18 @@ static inline void send_attribute(IWineD3DDeviceImpl *This, const DWORD type, co case WINED3DDECLTYPE_UBYTE4: GL_EXTCALL(glVertexAttrib4ubvARB(index, ptr)); break; - case WINED3DDECLTYPE_UBYTE4N: case WINED3DDECLTYPE_D3DCOLOR: + if (GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA)) + { + const DWORD *src = ptr; + DWORD c = *src & 0xff00ff00; + c |= (*src & 0xff0000) >> 16; + c |= (*src & 0xff) << 16; + GL_EXTCALL(glVertexAttrib4NubvARB(index, (GLubyte *)&c)); + break; + } + /* else fallthrough */ + case WINED3DDECLTYPE_UBYTE4N: GL_EXTCALL(glVertexAttrib4NubvARB(index, ptr)); break; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b15eacc..ce85403 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3925,8 +3925,18 @@ static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, case WINED3DDECLTYPE_UBYTE4: GL_EXTCALL(glVertexAttrib4NubvARB(i, ptr)); break; - case WINED3DDECLTYPE_UBYTE4N: case WINED3DDECLTYPE_D3DCOLOR: + if (GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA)) + { + const DWORD *src = (const DWORD *)ptr; + DWORD c = *src & 0xff00ff00; + c |= (*src & 0xff0000) >> 16; + c |= (*src & 0xff) << 16; + GL_EXTCALL(glVertexAttrib4NubvARB(i, (GLubyte *)&c)); + break; + } + /* else fallthrough */ + case WINED3DDECLTYPE_UBYTE4N: GL_EXTCALL(glVertexAttrib4NubvARB(i, ptr)); break;

1 0

Henri Verbeet : wined3d: Don't use drawStridedFast() for drawing pretransformed vertices.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: bae1ec98ca010016eff3b28677f34f8aab414eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae1ec98ca010016eff3b2867… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 23 10:22:34 2009 +0100 wined3d: Don't use drawStridedFast() for drawing pretransformed vertices. This was exposed by adding EXT_vertex_array_bgra support, previously we would almost never hit this because color data being present would already prevent us from using drawStridedFast(). Thanks to Stefan for spotting this. --- dlls/wined3d/state.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 54e9733..e1aeeab 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4278,6 +4278,7 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo device->useDrawStridedSlow = FALSE; } } else if (fixup || (!dataLocations->u.s.pSize.lpData + && !dataLocations->position_transformed && (GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA) || (!dataLocations->u.s.diffuse.lpData && !dataLocations->u.s.specular.lpData))))

1 0

Henri Verbeet : wined3d: Don't use drawStridedFast() when pointsize data is present.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 0cc5f0d3ebf4a841ea11f71bac52c6946a61ff8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc5f0d3ebf4a841ea11f71ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 23 10:22:33 2009 +0100 wined3d: Don't use drawStridedFast() when pointsize data is present. --- dlls/wined3d/state.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ce85403..54e9733 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4277,10 +4277,11 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo load_numbered = TRUE; device->useDrawStridedSlow = FALSE; } - } else if (fixup || GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA) || - (dataLocations->u.s.pSize.lpData == NULL && - dataLocations->u.s.diffuse.lpData == NULL && - dataLocations->u.s.specular.lpData == NULL)) { + } else if (fixup || (!dataLocations->u.s.pSize.lpData + && (GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA) + || (!dataLocations->u.s.diffuse.lpData + && !dataLocations->u.s.specular.lpData)))) + { /* Load the vertex data using named arrays */ load_named = TRUE; device->useDrawStridedSlow = FALSE;

1 0

Henri Verbeet : d3d10core: Add a stub ID3D10RenderTargetView implementation .
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: b279d6574a6641c7775b7cc580c1cbbcec22d05f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b279d6574a6641c7775b7cc58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 23 10:22:34 2009 +0100 d3d10core: Add a stub ID3D10RenderTargetView implementation. --- dlls/d3d10core/Makefile.in | 3 +- dlls/d3d10core/d3d10core_private.h | 10 +++ dlls/d3d10core/device.c | 20 +++++- dlls/d3d10core/view.c | 145 ++++++++++++++++++++++++++++++++++++ 4 files changed, 175 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index fe3ead6..6521150 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -10,7 +10,8 @@ C_SRCS = \ d3d10core_main.c \ device.c \ texture2d.c \ - utils.c + utils.c \ + view.c RC_SRCS = version.rc diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 5453600..ab79a80 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -62,6 +62,16 @@ struct d3d10_texture2d IWineD3DSurface *wined3d_surface; }; +/* ID3D10RenderTargetView */ +extern const struct ID3D10RenderTargetViewVtbl d3d10_rendertarget_view_vtbl; +struct d3d10_rendertarget_view +{ + const struct ID3D10RenderTargetViewVtbl *vtbl; + LONG refcount; + + ID3D10Resource *resource; +}; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 2e4c5c1..5268ac4 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -656,9 +656,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Device *iface, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3D10RenderTargetView **view) { - FIXME("iface %p, resource %p, desc %p, view %p stub!\n", iface, resource, desc, view); + struct d3d10_rendertarget_view *object; - return E_NOTIMPL; + TRACE("iface %p, resource %p, desc %p, view %p stub!\n", iface, resource, desc, view); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 rendertarget view object memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &d3d10_rendertarget_view_vtbl; + object->refcount = 1; + object->resource = resource; + ID3D10Resource_AddRef(resource); + + *view = (ID3D10RenderTargetView *)object; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Device *iface, diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c new file mode 100644 index 0000000..7810c82 --- /dev/null +++ b/dlls/d3d10core/view.c @@ -0,0 +1,145 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * 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 "config.h" +#include "wine/port.h" + +#include "d3d10core_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_QueryInterface(ID3D10RenderTargetView *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10RenderTargetView) + || IsEqualGUID(riid, &IID_ID3D10View) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_AddRef(ID3D10RenderTargetView *iface) +{ + struct d3d10_rendertarget_view *This = (struct d3d10_rendertarget_view *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_Release(ID3D10RenderTargetView *iface) +{ + struct d3d10_rendertarget_view *This = (struct d3d10_rendertarget_view *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u\n", This, refcount); + + if (!refcount) + { + ID3D10Resource_Release(This->resource); + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* ID3D10DeviceChild methods */ + +static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDevice(ID3D10RenderTargetView *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_GetPrivateData(ID3D10RenderTargetView *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateData(ID3D10RenderTargetView *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateDataInterface(ID3D10RenderTargetView *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +/* ID3D10View methods */ + +static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetResource(ID3D10RenderTargetView *iface, + ID3D10Resource **resource) +{ + struct d3d10_rendertarget_view *This = (struct d3d10_rendertarget_view *)iface; + + TRACE("iface %p, resource %p\n", iface, resource); + + ID3D10Resource_AddRef(This->resource); + *resource = This->resource; +} + +/* ID3D10RenderTargetView methods */ + +static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDesc(ID3D10RenderTargetView* iface, + D3D10_RENDER_TARGET_VIEW_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +const struct ID3D10RenderTargetViewVtbl d3d10_rendertarget_view_vtbl = +{ + /* IUnknown methods */ + d3d10_rendertarget_view_QueryInterface, + d3d10_rendertarget_view_AddRef, + d3d10_rendertarget_view_Release, + /* ID3D10DeviceChild methods */ + d3d10_rendertarget_view_GetDevice, + d3d10_rendertarget_view_GetPrivateData, + d3d10_rendertarget_view_SetPrivateData, + d3d10_rendertarget_view_SetPrivateDataInterface, + /* ID3D10View methods */ + d3d10_rendertarget_view_GetResource, + /* ID3D10RenderTargetView methods */ + d3d10_rendertarget_view_GetDesc, +};

1 0

Alexandre Julliard : user32/tests: Make the DC test window top-most. Ignore an extra WM_MOUSEMOVE.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 00b851d8644c914aa1772bc1349277b297268da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b851d8644c914aa1772bc13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 23 13:13:54 2009 +0100 user32/tests: Make the DC test window top-most. Ignore an extra WM_MOUSEMOVE. --- dlls/user32/tests/win.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 8ec8a61..d2e9bc6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2786,6 +2786,12 @@ static void test_mouse_input(HWND hwnd) ret = wait_for_message( &msg ); ok(ret, "no message available\n"); + if (msg.message == WM_MOUSEMOVE) /* win2k has an extra WM_MOUSEMOVE here */ + { + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); + } + ok(msg.hwnd == popup && msg.message == WM_LBUTTONDOWN, "hwnd %p/%p message %04x\n", msg.hwnd, popup, msg.message); @@ -3795,6 +3801,7 @@ static void test_csparentdc(void) ShowWindow(hwndMain, SW_SHOW); ShowWindow(hwnd1, SW_SHOW); ShowWindow(hwnd2, SW_SHOW); + SetWindowPos(hwndMain, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); flush_events( TRUE ); zero_parentdc_test(&test_answer);

1 0

Michael Stefaniuc : dinput8: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 70a4954840129fbc1f37a1f37e99bd8018b91755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a4954840129fbc1f37a1f37… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 23 10:36:48 2009 +0100 dinput8: Remove superfluous pointer casts. --- dlls/dinput8/dinput8_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c index 4902903..c855caf 100644 --- a/dlls/dinput8/dinput8_main.c +++ b/dlls/dinput8/dinput8_main.c @@ -74,12 +74,12 @@ HRESULT WINAPI DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, /* When aggregation is used (punkOuter!=NULL) the application needs to manually call Initialize. */ if(punkOuter == NULL && IsEqualGUID(&IID_IDirectInput8A, riid)) { - LPDIRECTINPUTA DI = (LPDIRECTINPUTA)*ppDI; + LPDIRECTINPUTA DI = *ppDI; IDirectInput8_Initialize(DI, hinst, dwVersion); } if(punkOuter == NULL && IsEqualGUID(&IID_IDirectInput8W, riid)) { - LPDIRECTINPUTW DI = (LPDIRECTINPUTW)*ppDI; + LPDIRECTINPUTW DI = *ppDI; IDirectInput8_Initialize(DI, hinst, dwVersion); } @@ -159,7 +159,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); if ( IsEqualCLSID( &IID_IClassFactory, riid ) ) { - *ppv = (LPVOID)&DINPUT8_CF; + *ppv = &DINPUT8_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; }

1 0

Anders Jonsson : winhlp32: Update Swedish translation.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 4e733f98e3c9b90c4aecc14cc831ee9ff5a71d18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e733f98e3c9b90c4aecc14cc… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Fri Jan 23 10:16:50 2009 +0100 winhlp32: Update Swedish translation. --- programs/winhlp32/Sv.rc | 48 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/programs/winhlp32/Sv.rc b/programs/winhlp32/Sv.rc index 3bd6c93..d389328 100644 --- a/programs/winhlp32/Sv.rc +++ b/programs/winhlp32/Sv.rc @@ -5,6 +5,7 @@ * Swedish language by Karl Backstr�m <karl_b(a)geocities.com> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2007, 2008 Daniel Nylander <po(a)danielnylander.se> + * Copyright 2009 Anders Jonsson * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -51,9 +52,9 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL MENUITEM "Historik", MNID_OPTS_HISTORY POPUP "Typsnitt" BEGIN - MENUITEM "Liten", MNID_OPTS_FONTS_SMALL - MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Stor", MNID_OPTS_FONTS_LARGE + MENUITEM "Litet", MNID_OPTS_FONTS_SMALL + MENUITEM "Normalt", MNID_OPTS_FONTS_NORMAL + MENUITEM "Stort", MNID_OPTS_FONTS_LARGE END MENUITEM "Anv�nd systemf�rger", MNID_OPTS_SYSTEM_COLORS } @@ -68,10 +69,26 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Index" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "S�k" +{ + LTEXT "Inte implementerat �nnu", -1, 10, 10, 180, 150 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL { -STID_WINE_HELP, "WINE Hj�lp" +STID_WINE_HELP, "Wine Hj�lp" STID_WHERROR, "FEL" STID_WARNING, "VARNING" STID_INFO, "Information" @@ -86,3 +103,26 @@ STID_FILE_NOT_FOUND_s "Kan inte hitta '%s'. Vill du s STID_NO_RICHEDIT "Kan inte hitta en implementation av richedit... Avslutar" STID_PSH_INDEX, "Hj�lprubriker: " } + +CONTEXT_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +BEGIN + POPUP "" + BEGIN + MENUITEM "Kommentar...", MNID_CTXT_ANNOTATE + MENUITEM "Kopiera", MNID_CTXT_COPY + MENUITEM "Skriv ut...", MNID_CTXT_PRINT + POPUP "Typsnitt" + BEGIN + MENUITEM "Litet", MNID_CTXT_FONTS_SMALL + MENUITEM "Normalt", MNID_CTXT_FONTS_NORMAL + MENUITEM "Stort", MNID_CTXT_FONTS_LARGE + END + POPUP "Hj�lp alltid synlig" + BEGIN + MENUITEM "Standard", MNID_CTXT_HELP_DEFAULT + MENUITEM "Synlig", MNID_CTXT_HELP_VISIBLE + MENUITEM "Ej synlig", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Anv�nd systemf�rger", MNID_CTXT_SYSTEM_COLORS + END +END

1 0

Nikolay Sivov : kernel32: Added DeleteTimerQueue.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 2ddcb295b6e9dd25f298c34e48284970798ae884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ddcb295b6e9dd25f298c34e4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jan 22 20:55:35 2009 +0300 kernel32: Added DeleteTimerQueue. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/sync.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 13c7cd4..9c70d56 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -281,7 +281,7 @@ @ stdcall DeleteFiber(ptr) @ stdcall DeleteFileA(str) @ stdcall DeleteFileW(wstr) -# @ stub DeleteTimerQueue +@ stdcall DeleteTimerQueue(long) @ stdcall DeleteTimerQueueEx (long long) @ stdcall DeleteTimerQueueTimer(long long long) # @ stub DeleteVolumeMountPointA diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index d65bd12..be96633 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1330,6 +1330,14 @@ BOOL WINAPI DeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) } /*********************************************************************** + * DeleteTimerQueue (KERNEL32.@) + */ +BOOL WINAPI DeleteTimerQueue(HANDLE TimerQueue) +{ + return DeleteTimerQueueEx(TimerQueue, NULL); +} + +/*********************************************************************** * CreateTimerQueueTimer (KERNEL32.@) * * Creates a timer-queue timer. This timer expires at the specified due

1 0

Aric Stewart : shdocvw: Stub implementation of IEParseDisplayNameWithBCW.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 3aebdbb65de704bea259a9ac0323e35a8435057c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aebdbb65de704bea259a9ac0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jan 22 14:59:08 2009 -0600 shdocvw: Stub implementation of IEParseDisplayNameWithBCW. --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index f47ecb4..2bfcc8f 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -89,7 +89,7 @@ 215 stub -noname GetSearchAssistantUrlA 216 stub -noname GetDefaultInternetSearchUrlW 217 stub -noname GetDefaultInternetSearchUrlA -218 stub -noname IEParseDisplayNameWithBCW +218 stdcall -noname IEParseDisplayNameWithBCW(long wstr ptr ptr) 219 stub -noname IEILIsEqual 220 stub @ 221 stub -noname IECreateFromPathCPWithBCA diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index a065aa5..110b713 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -396,3 +396,13 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD TRACE("=> %d\n", res); return res; } + +/****************************************************************** + * IEParseDisplayNameWithBCW (SHDOCVW.218) + */ +HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName, LPBC pbc, LPITEMIDLIST *ppidl) +{ + /* Guessing at parameter 3 based on IShellFolder's ParseDisplayName */ + FIXME("stub: 0x%x %s %p %p\n",codepage,debugstr_w(lpszDisplayName),pbc,ppidl); + return E_FAIL; +}

1 0