June 2006 - Wine-Commits - list.winehq.org

Paul Vriens : shlwapi: PathCombineW should return NULL on invalid parameters.
by Alexandre Julliard June 26, 2006

June 26, 2006

Module: wine Branch: refs/heads/master Commit: a796b8a3f7a7776876ea16cc9613a537c60a4fcb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a796b8a3f7a7776876ea16c… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Jun 23 15:21:02 2006 +0200 shlwapi: PathCombineW should return NULL on invalid parameters. --- dlls/shlwapi/path.c | 2 +- dlls/shlwapi/tests/path.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index cc134b2..5e9bd68 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -163,7 +163,7 @@ LPWSTR WINAPI PathCombineW(LPWSTR lpszDe TRACE("(%p,%s,%s)\n", lpszDest, debugstr_w(lpszDir), debugstr_w(lpszFile)); if (!lpszDest || (!lpszDir && !lpszFile)) - return lpszDest; /* Invalid parameters */ + return NULL; /* Invalid parameters */ if (!lpszFile || !*lpszFile) { diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 043e899..168671e 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -31,6 +31,7 @@ #include "wininet.h" static HMODULE hShlwapi; static HRESULT (WINAPI *pPathIsValidCharA)(char,DWORD); static HRESULT (WINAPI *pPathIsValidCharW)(WCHAR,DWORD); +static LPWSTR (WINAPI *pPathCombineW)(LPWSTR, LPCWSTR, LPCWSTR); const char* TEST_URL_1 = "http://www.winehq.org/tests?date=10/10/1923"; const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%2010/10/1923"; @@ -860,6 +861,37 @@ static void test_PathMatchSpec(void) ok (PathMatchSpecA(file, spec13) == TRUE, "PathMatchSpec: Spec13 failed\n"); } +static void test_PathCombine(void) +{ + LPSTR szString, szString2; + LPWSTR wszString, wszString2; + + szString2 = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(char)); + wszString2 = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + + /* NULL test */ + szString = PathCombineA(NULL, NULL, NULL); + ok (szString == NULL, "Expected a NULL return\n"); + + if (pPathCombineW) + { + wszString = pPathCombineW(NULL, NULL, NULL); + ok (wszString == NULL, "Expected a NULL return\n"); + } + + /* Some NULL */ + szString = PathCombineA(szString2, NULL, NULL); + ok (szString == NULL, "Expected a NULL return\n"); + + if (pPathCombineW) + { + wszString = pPathCombineW(wszString2, NULL, NULL); + ok (wszString == NULL, "Expected a NULL return\n"); + } + + HeapFree(GetProcessHeap(), 0, szString2); + HeapFree(GetProcessHeap(), 0, wszString2); +} START_TEST(path) { @@ -893,4 +925,7 @@ START_TEST(path) pPathIsValidCharW = (void*)GetProcAddress(hShlwapi, (LPSTR)456); if (pPathIsValidCharW) test_PathIsValidCharW(); } + + pPathCombineW = (void*)GetProcAddress(hShlwapi, "PathCombineW"); + test_PathCombine(); }

1 0

Hwang YunSong(황윤성) : oleview: Added Korean resources.
by Alexandre Julliard June 26, 2006

June 26, 2006

Module: wine Branch: refs/heads/master Commit: a880317e2330da2180b10a1c97638d2b9be04e34 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a880317e2330da2180b10a1… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Jun 26 09:06:56 2006 +0900 oleview: Added Korean resources. --- programs/oleview/Ko.rc | 144 ++++++++++++++++++++++++++++++++++++++++++++++ programs/oleview/rsrc.rc | 1 2 files changed, 145 insertions(+), 0 deletions(-) create mode 100644 programs/oleview/Ko.rc diff --git a/programs/oleview/Ko.rc b/programs/oleview/Ko.rc new file mode 100644 index 0000000..8321830 --- /dev/null +++ b/programs/oleview/Ko.rc @@ -0,0 +1,144 @@ +/* + * OleView (Ko.rc) + * Korean Language Support + * + * Copyright 2006 Piotr Caban + * Copyright 2006 YunSong Hwang + * + * 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 + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +IDM_MENU MENU +{ + POPUP "��(&F)" + { + MENUITEM "��Ͽ� ��(&B)...", IDM_BIND + MENUITEM "Ÿ�� ̺귯�� (&V)...", IDM_TYPELIB + MENUITEM SEPARATOR + MENUITEM "�ý�� (&S)", IDM_SYSCONF + MENUITEM "��Ʈ�� (&R)", IDM_REGEDIT + MENUITEM SEPARATOR + MENUITEM "��(&X)", IDM_EXIT + } + POPUP " ��ü(&O)" + { + POPUP "&CoCreateInstance �÷�" + { + MENUITEM "CLSCTX_&INPROC_SERVER", IDM_FLAG_INSERV,CHECKED + MENUITEM "CLSCTX_INPROC_&HANDLER", IDM_FLAG_INHANDL + MENUITEM "CLSCTX_&LOCAL_SERVER", IDM_FLAG_LOCSERV,CHECKED + MENUITEM "CLSCTX_&REMOTE_SERVER", IDM_FLAG_REMSERV + } + MENUITEM SEPARATOR + MENUITEM "Ÿ�� (&T)", IDM_TYPEINFO, GRAYED + MENUITEM SEPARATOR + MENUITEM "�ν��Ͻ� ��(&I)", IDM_CREATEINST, GRAYED + MENUITEM "�ν��Ʈ ��(Instance &On) ��", IDM_CREATEINSTON, GRAYED + MENUITEM "�ν��Ʈ ��ϱ�(&R)", IDM_RELEASEINST, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&LSID�� Ŭ�� ", IDM_COPYCLSID, GRAYED + MENUITEM "&HTML ��ü �±׸� Ŭ�� ", IDM_HTMLTAG, GRAYED + MENUITEM SEPARATOR + MENUITEM "��(&V)...", IDM_VIEW, GRAYED + } + POPUP "��(&V)" + { + MENUITEM "�� (&E)", IDM_EXPERT,CHECKED + MENUITEM SEPARATOR + MENUITEM "��Ʈ �з� ��(&H)", IDM_HIDDEN, GRAYED + MENUITEM SEPARATOR + MENUITEM "��(&T)", IDM_TOOLBAR,CHECKED + MENUITEM "��¹�(&S)", IDM_STATUSBAR,CHECKED + MENUITEM SEPARATOR + MENUITEM "�� ħ(&R)\tF5", IDM_REFRESH + } + POPUP "��(&H)" + { + MENUITEM "OleView ��(&A)", IDM_ABOUT + } +} + +STRINGTABLE +{ + IDS_APPNAME "OleView" + IDS_APPTITLE "OleView" + IDS_READY "�غ�" + IDS_ABOUT "OleView - OLE/COM ��ü ��ֱ�" + IDS_ABOUTVER "�� 1.0" + + IDM_BIND, "�� " + IDM_TYPELIB, "Ÿ�� ̺귯�� " + IDM_SYSCONF, "�ӽ� ��ü�� DCOM�� ٲٱ�" + IDM_REGEDIT, "Wine ��Ʈ�� " + IDM_EXIT, "�ٲ� �� �� α׷� ��" + IDM_CREATEINST, "��õ� ��ü�� ν��Ʈ ��" + IDM_CREATEINSTON, "�� ӽ�� õ� ��ü�� ν��Ʈ ��" + IDM_RELEASEINST, "�� õ� ��ü �ν��Ʈ ��ϱ�" + IDM_COPYCLSID, "�� õ� �׸�� GUID�� Ŭ�� " + IDM_VIEW, "��õ� �׸�� " + IDM_FLAG_INSERV, "CoGetClassObject�� ȣ�� Use CLSCTX_INPROC_SERVER ��" + IDM_FLAG_INHANDL, "CoGetClassObject�� ȣ�� Use CLSCTX_INPROC_HANDLER ��" + IDM_FLAG_LOCSERV, "CoGetClassObject�� ȣ�� CLSCTX_LOCAL_SERVER ��" + IDM_FLAG_REMSERV, "CoGetClassObject�� ȣ�� CLSCTX_REMOTE_SERVER ��" + IDM_EXPERT, "�� ʺ�� ȯe" + IDM_HIDDEN, "��Ʈ �� (�� ʴ��)" + IDM_TOOLBAR, "�� /��" + IDM_STATUSBAR, "��¹� ��/��" + IDM_REFRESH, "�� ħ" + IDM_ABOUT, "��α׷� ��, ��, ��۱� ��ֱ�" + + IDS_TREE_OC, "ObjectClasses" + IDS_TREE_GBCC, "��Ʈ �з�" + IDS_TREE_O1O, "OLE 1.0 ��ü" + IDS_TREE_CLO, "COM ��̺귯�� ü" + IDS_TREE_AO, "�� ü" + IDS_TREE_AID, "��α׷� IDs" + IDS_TREE_TL, "Ÿ�� ̺귯��" + IDS_TL_VER, "ver." + IDS_TREE_I, "��̽�" + + IDS_TAB_REG, "Registry" + IDS_TAB_IMPL, "Implementation" + IDS_TAB_ACTIV, "Activation" + + IDS_CGCOFAIL, "CoGetClassObject ��." + IDS_ERROR_UNKN, "�˼� �� " +} + +DLG_CREATEINSTON DIALOG DISCARDABLE 0, 0, 250, 41 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "�ٸ� �ӽ�(machine)�� " +FONT 8, "MS Shell Dlg" +{ + LTEXT "�ӽ�(&Machine) �̸�:", IDIGNORE, 5, 6, 190, 8 + EDITTEXT IDC_MACHINE, 5, 16, 190, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "Ȯ��(&O)", IDOK, 200, 5, 45, 14 + PUSHBUTTON "��(&C)", IDCANCEL, 200, 22, 45, 14 +} + +DLG_SYSCONF DIALOG DISCARDABLE 0, 0, 170, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "�ý�� " +FONT 8, "MS Shell Dlg" +{ + LTEXT "�ý�� ", IDIGNORE, 5, 6, 160, 8 + CHECKBOX "DCOM ��(&E)", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "�� (&R) (Win95�� ش�)", IDC_ENABLEREMOTE, 5, 35, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + LTEXT "�� Ʈ�� ٲߴϴ�.\nWIne�� ɿ�� ƹ� �� Ĩ�ϴ�.", IDIGNORE, 5, 50, 160, 40 + DEFPUSHBUTTON "Ȯ��(&O)", IDOK, 70, 80, 45, 14 + PUSHBUTTON "��(&C)", IDCANCEL, 120, 80, 45, 14 +} diff --git a/programs/oleview/rsrc.rc b/programs/oleview/rsrc.rc index 7193fa3..5b3a779 100644 --- a/programs/oleview/rsrc.rc +++ b/programs/oleview/rsrc.rc @@ -23,6 +23,7 @@ #include "resource.h" #include "En.rc" #include "Fr.rc" +#include "Ko.rc" IDA_OLEVIEW ACCELERATORS DISCARDABLE {

1 0

Piotr Caban : oleview: Fix compilation with gcc 2.95.
by Alexandre Julliard June 26, 2006

June 26, 2006

Module: wine Branch: refs/heads/master Commit: 33d0216b61d7c76f6bbbf80092b175a5262cb4c1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=33d0216b61d7c76f6bbbf80… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sat Jun 24 13:19:12 2006 +0200 oleview: Fix compilation with gcc 2.95. - patch based on Francois Gouget Fix compilation with gcc 2.95 patch - moved some string to resources - fixed implementation of IPersistStream interface viewer --- programs/oleview/En.rc | 3 + programs/oleview/details.c | 16 +++---- programs/oleview/interface.c | 16 +++++-- programs/oleview/main.h | 6 ++ programs/oleview/resource.h | 4 ++ programs/oleview/tree.c | 102 +++++++++++++++++++++--------------------- 6 files changed, 83 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=33d0216b61d7c76f6bb…

1 0

Piotr Caban : oleview: Added propper ClassName displaying to interface viewer.
by Alexandre Julliard June 26, 2006

June 26, 2006

Module: wine Branch: refs/heads/master Commit: c3e5807b57e7b0c6f287001ec32128378ec82581 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c3e5807b57e7b0c6f287001… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sat Jun 24 11:56:55 2006 +0200 oleview: Added propper ClassName displaying to interface viewer. --- programs/oleview/interface.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/programs/oleview/interface.c b/programs/oleview/interface.c index 5eb1b98..69ab616 100644 --- a/programs/oleview/interface.c +++ b/programs/oleview/interface.c @@ -110,24 +110,28 @@ INT_PTR CALLBACK InterfaceViewerProc(HWN return FALSE; } -void IPersistStreamInterfaceViewer(WCHAR *clsid) +void IPersistStreamInterfaceViewer(WCHAR *clsid, WCHAR *wszName) { DIALOG_INFO di; WCHAR wszClassMoniker[] = { 'C','l','a','s','s','M','o','n','i','k','e','r','\0' }; - di.wszLabel = wszClassMoniker; + if(wszName[0] == '{') + di.wszLabel = wszClassMoniker; + else di.wszLabel = wszName; di.wszIdentifier = clsid; DialogBoxParam(0, MAKEINTRESOURCE(DLG_IPERSISTSTREAM_IV), globals.hMainWnd, InterfaceViewerProc, (LPARAM)&di); } -void IPersistInterfaceViewer(WCHAR *clsid) +void IPersistInterfaceViewer(WCHAR *clsid, WCHAR *wszName) { DIALOG_INFO di; WCHAR wszClassMoniker[] = { 'C','l','a','s','s','M','o','n','i','k','e','r','\0' }; - di.wszLabel = wszClassMoniker; + if(wszName[0] == '{') + di.wszLabel = wszClassMoniker; + else di.wszLabel = wszName; di.wszIdentifier = clsid; DialogBoxParam(0, MAKEINTRESOURCE(DLG_IPERSIST_IV), @@ -150,6 +154,7 @@ void InterfaceViewer(HTREEITEM item) TVITEM tvi; WCHAR *clsid; WCHAR wszName[MAX_LOAD_STRING]; + WCHAR wszParent[MAX_LOAD_STRING]; WCHAR wszIPersistStream[] = { '{','0','0','0','0','0','1','0','9','-', '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', '0','0','0','0','0','0','0','0','0','0','4','6','}','\0' }; @@ -166,11 +171,19 @@ void InterfaceViewer(HTREEITEM item) SendMessage(globals.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); clsid = ((ITEM_INFO*)tvi.lParam)->clsid; + memset(&tvi, 0, sizeof(TVITEM)); + tvi.mask = TVIF_TEXT; + tvi.hItem = TreeView_GetParent(globals.hTree, item); + tvi.cchTextMax = MAX_LOAD_STRING; + tvi.pszText = wszParent; + + SendMessage(globals.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); + if(!memcmp(clsid, wszIPersistStream, sizeof(wszIPersistStream))) - IPersistStreamInterfaceViewer(clsid); + IPersistStreamInterfaceViewer(clsid, wszParent); else if(!memcmp(clsid, wszIPersist, sizeof(wszIPersist))) - IPersistInterfaceViewer(clsid); + IPersistInterfaceViewer(clsid, wszParent); else DefaultInterfaceViewer(clsid, wszName); }

1 0

Piotr Caban : oleview: Added interface viewer.
by Alexandre Julliard June 26, 2006

June 26, 2006

Module: wine Branch: refs/heads/master Commit: 72d454ab87d4380c42bfd4ee8a41defff48d21e8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=72d454ab87d4380c42bfd4e… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sat Jun 24 10:33:29 2006 +0200 oleview: Added interface viewer. --- programs/oleview/En.rc | 41 ++++++++++ programs/oleview/Makefile.in | 1 programs/oleview/interface.c | 176 ++++++++++++++++++++++++++++++++++++++++++ programs/oleview/main.h | 4 + programs/oleview/oleview.c | 13 ++- programs/oleview/resource.h | 13 +++ 6 files changed, 245 insertions(+), 3 deletions(-) create mode 100644 programs/oleview/interface.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=72d454ab87d4380c42b…

1 0

Stefan Dösinger : ddraw/wined3d: IDirectDrawSurface7:: SetSurfaceDesc corrections.
by Alexandre Julliard June 26, 2006

June 26, 2006

Module: wine Branch: refs/heads/master Commit: 495e46197a52b4d7c3630b7b73013e70afe69e54 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=495e46197a52b4d7c3630b7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jun 23 17:13:10 2006 +0200 ddraw/wined3d: IDirectDrawSurface7::SetSurfaceDesc corrections. --- dlls/ddraw/surface.c | 65 +++++++++++++++++++++++--------------- dlls/wined3d/surface.c | 6 ---- dlls/wined3d/surface_gdi.c | 1 - include/wine/wined3d_interface.h | 2 - 4 files changed, 39 insertions(+), 35 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9da19f4..975f8cd 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1860,49 +1860,62 @@ IDirectDrawSurfaceImpl_SetSurfaceDesc(ID DWORD Flags) { ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface); - BYTE *newSurface = NULL; - DWORD newSize = 0; WINED3DFORMAT newFormat = WINED3DFMT_UNKNOWN; HRESULT hr; - FIXME("(%p)->(%p,%lx)\n", This, DDSD, Flags); - assert(0); + TRACE("(%p)->(%p,%lx)\n", This, DDSD, Flags); if(!DDSD) return DDERR_INVALIDPARAMS; + if (DDSD->dwFlags & DDSD_LPSURFACE && DDSD->lpSurface) + { + ERR("Setting the surface memory isn't supported yet\n"); + return DDERR_INVALIDPARAMS; + + } if (DDSD->dwFlags & DDSD_PIXELFORMAT) { newFormat = PixelFormat_DD2WineD3D(&DDSD->u4.ddpfPixelFormat); + + if(newFormat == WINED3DFMT_UNKNOWN) + { + ERR("Requested to set an unknown pixelformat\n"); + return DDERR_INVALIDPARAMS; + } + if(newFormat != PixelFormat_DD2WineD3D(&This->surface_desc.u4.ddpfPixelFormat) ) + { + hr = IWineD3DSurface_SetFormat(This->WineD3DSurface, + newFormat); + if(hr != DD_OK) return hr; + } } - if (DDSD->dwFlags & DDSD_LPSURFACE) + if (DDSD->dwFlags & DDSD_CKDESTOVERLAY) { - newSurface = DDSD->lpSurface; - newSize = DDSD->u1.dwLinearSize; - /* to avoid unpredictable things */ - assert(newSize != 0); + IWineD3DSurface_SetColorKey(This->WineD3DSurface, + DDCKEY_DESTOVERLAY, + &DDSD->u3.ddckCKDestOverlay); } - - /* Better: Use SetFormat */ - hr = IWineD3DSurface_SetPixelFormat(This->WineD3DSurface, - newFormat, - newSurface, - newSize); - if(hr != DD_OK) return hr; - - /* Store the new data. Not really necessary, as WineD3D stores it too, - * but for completeness - */ - if(newFormat != WINED3DFMT_UNKNOWN) + if (DDSD->dwFlags & DDSD_CKDESTBLT) + { + IWineD3DSurface_SetColorKey(This->WineD3DSurface, + DDCKEY_DESTBLT, + &DDSD->ddckCKDestBlt); + } + if (DDSD->dwFlags & DDSD_CKSRCOVERLAY) { - This->surface_desc.dwFlags |= DDSD_PIXELFORMAT; - This->surface_desc.u4.ddpfPixelFormat = DDSD->u4.ddpfPixelFormat; + IWineD3DSurface_SetColorKey(This->WineD3DSurface, + DDCKEY_SRCOVERLAY, + &DDSD->ddckCKSrcOverlay); } - if(newSurface != NULL) + if (DDSD->dwFlags & DDSD_CKSRCBLT) { - This->surface_desc.lpSurface = newSurface; - This->surface_desc.u1.dwLinearSize = newSize; + IWineD3DSurface_SetColorKey(This->WineD3DSurface, + DDCKEY_SRCBLT, + &DDSD->ddckCKSrcBlt); } + This->surface_desc = *DDSD; + return DD_OK; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dc9caa4..25a3e7a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2536,11 +2536,6 @@ HRESULT WINAPI IWineD3DSurfaceImpl_BltFa return IWineGDISurfaceImpl_BltFast(iface, dstx, dsty, Source, rsrc, trans); } -HRESULT WINAPI IWineD3DSurfaceImpl_SetPixelFormat(IWineD3DSurface *iface, WINED3DFORMAT Format, BYTE *Surface, DWORD Size) { - FIXME("This is unimplemented for now(d3d7 merge)\n"); - return WINED3DERR_INVALIDCALL; -} - HRESULT WINAPI IWineD3DSurfaceImpl_GetPalette(IWineD3DSurface *iface, IWineD3DPalette **Pal) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; TRACE("(%p)->(%p)\n", This, Pal); @@ -2790,7 +2785,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurfac IWineD3DSurfaceImpl_IsLost, IWineD3DSurfaceImpl_Restore, IWineD3DSurfaceImpl_BltFast, - IWineD3DSurfaceImpl_SetPixelFormat, IWineD3DSurfaceImpl_GetPalette, IWineD3DSurfaceImpl_SetPalette, IWineD3DSurfaceImpl_RealizePalette, diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index b26f3c9..3fe44af 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -1538,7 +1538,6 @@ const IWineD3DSurfaceVtbl IWineGDISurfac IWineD3DSurfaceImpl_IsLost, IWineD3DSurfaceImpl_Restore, IWineGDISurfaceImpl_BltFast, - IWineD3DSurfaceImpl_SetPixelFormat, IWineD3DSurfaceImpl_GetPalette, IWineD3DSurfaceImpl_SetPalette, IWineD3DSurfaceImpl_RealizePalette, diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index c4fea25..5af0f95 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1133,7 +1133,6 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine STDMETHOD(IsLost)(THIS) PURE; STDMETHOD(Restore)(THIS) PURE; STDMETHOD(BltFast)(THIS_ DWORD dstx, DWORD dsty, IWineD3DSurface *src, RECT *rsrc, DWORD trans) PURE; - STDMETHOD(SetPixelFormat)(THIS_ WINED3DFORMAT Format, BYTE *Surface, DWORD Size) PURE; STDMETHOD(GetPalette)(THIS_ struct IWineD3DPalette **Palette) PURE; STDMETHOD(SetPalette)(THIS_ struct IWineD3DPalette *Palette) PURE; STDMETHOD(RealizePalette)(THIS) PURE; @@ -1185,7 +1184,6 @@ #define IWineD3DSurface_GetFlipStatus(p, #define IWineD3DSurface_IsLost(p) (p)->lpVtbl->IsLost(p) #define IWineD3DSurface_Restore(p) (p)->lpVtbl->Restore(p) #define IWineD3DSurface_BltFast(p,a,b,c,d,e) (p)->lpVtbl->BltFast(p,a,b,c,d,e) -#define IWineD3DSurface_SetPixelFormat(p,a,b,c) (p)->lpVtbl->SetPixelFormat(p,a,b,c) #define IWineD3DSurface_GetPalette(p, a) (p)->lpVtbl->GetPalette(p, a) #define IWineD3DSurface_SetPalette(p, a) (p)->lpVtbl->SetPalette(p, a) #define IWineD3DSurface_RealizePalette(p) (p)->lpVtbl->RealizePalette(p)

1 0

Andrew Talbot : gdi/tests: Write-strings warnings fix.
by Alexandre Julliard June 26, 2006

June 26, 2006

Module: wine Branch: refs/heads/master Commit: 8059576c8b4d78f6b45d45cbe3e3b45728524caf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8059576c8b4d78f6b45d45c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jun 24 15:01:31 2006 +0100 gdi/tests: Write-strings warnings fix. --- dlls/gdi/tests/metafile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/tests/metafile.c b/dlls/gdi/tests/metafile.c index dae5b09..7f4b0ae 100644 --- a/dlls/gdi/tests/metafile.c +++ b/dlls/gdi/tests/metafile.c @@ -1338,7 +1338,7 @@ static void checkConvertedFrameAndBounds if (getConvertedFrameAndBounds(buffer_size, buffer, mfpIsNull, mm, xExt, yExt, &rclBounds, &rclFrame)) { - char * msg; + const char * msg; char buf[64]; if (mfpIsNull) @@ -1347,7 +1347,7 @@ static void checkConvertedFrameAndBounds } else { - char * mm_str; + const char * mm_str; switch (mm) { case MM_ANISOTROPIC: mm_str = "MM_ANISOTROPIC"; break;

1 0

Andrew Talbot : widl: Write-strings warnings fix.
by Alexandre Julliard June 26, 2006

June 26, 2006

Module: wine Branch: refs/heads/master Commit: 0e1e585c73173287b9ab1132439b9913bf84830f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0e1e585c73173287b9ab113… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jun 23 22:14:28 2006 +0100 widl: Write-strings warnings fix. --- tools/widl/widltypes.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index b2258c9..d26b364 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -198,7 +198,7 @@ struct _expr_t { }; struct _type_t { - char *name; + const char *name; unsigned char type; struct _type_t *ref; const attr_t *attrs;

1 0

James Hawkins : shell32: Add missing multiply by sizeof(WCHAR)l
by Alexandre Julliard June 26, 2006

June 26, 2006

Module: wine Branch: refs/heads/master Commit: f921fa544aeb018286d49e58343f1c61ab4924fe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f921fa544aeb018286d49e5… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jun 23 05:24:40 2006 -0700 shell32: Add missing multiply by sizeof(WCHAR)l --- dlls/shell32/brsfolder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 88516a2..2ef6b76 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -636,7 +636,7 @@ static BOOL BrsFolder_OnSetSelectionA(br return BrsFolder_OnSetSelectionW(info, selection, is_str); if ((length = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)selection, -1, NULL, 0)) && - (selectionW = HeapAlloc(GetProcessHeap(), 0, length)) && + (selectionW = HeapAlloc(GetProcessHeap(), 0, length * sizeof(WCHAR))) && MultiByteToWideChar(CP_ACP, 0, (LPCSTR)selection, -1, selectionW, length)) { result = BrsFolder_OnSetSelectionW(info, selectionW, is_str);

1 0

Huw Davies : rpcrt4: Calculate size of FC_STRUCT arguments correctly.
by Alexandre Julliard June 26, 2006

June 26, 2006

Module: wine Branch: refs/heads/master Commit: 93fb9d10f5ee7ba960bd4d112383c115418d2293 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=93fb9d10f5ee7ba960bd4d1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 23 12:47:34 2006 +0100 rpcrt4: Calculate size of FC_STRUCT arguments correctly. --- dlls/rpcrt4/ndr_stubless.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 56e8eff..2e56c98 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1019,6 +1019,9 @@ static DWORD calc_arg_size(MIDL_STUB_MES DWORD size; switch(*pFormat) { + case RPC_FC_STRUCT: + size = *(const WORD*)(pFormat + 2); + break; case RPC_FC_CARRAY: size = *(const WORD*)(pFormat + 2); ComputeConformance(pStubMsg, NULL, pFormat + 4, 0);

1 0