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

Alexandre Julliard : dmsynth: Make the virtual table functions static where possible.
by Alexandre Julliard June 10, 2006

June 10, 2006

Module: wine Branch: refs/heads/master Commit: f6da014c4bffbb95ed73de233aad33ebe0d01669 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f6da014c4bffbb95ed73de2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 10 11:57:03 2006 +0200 dmsynth: Make the virtual table functions static where possible. --- dlls/dmsynth/dmsynth_private.h | 7 ----- dlls/dmsynth/synth.c | 52 ++++++++++++++++++++-------------------- dlls/dmsynth/synthsink.c | 24 +++++++++--------- 3 files changed, 38 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f6da014c4bffbb95ed7…

1 0

Alexandre Julliard : dmstyle: Make the virtual table functions static where possible.
by Alexandre Julliard June 10, 2006

June 10, 2006

Module: wine Branch: refs/heads/master Commit: 40feb043b1fd8dfb59631f6da79d7c1247155ce8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=40feb043b1fd8dfb59631f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 10 11:56:49 2006 +0200 dmstyle: Make the virtual table functions static where possible. --- dlls/dmstyle/auditiontrack.c | 62 +++++++++++++++++++----------------- dlls/dmstyle/chordtrack.c | 62 +++++++++++++++++++----------------- dlls/dmstyle/commandtrack.c | 62 +++++++++++++++++++----------------- dlls/dmstyle/dmstyle_private.h | 58 ---------------------------------- dlls/dmstyle/motiftrack.c | 62 +++++++++++++++++++----------------- dlls/dmstyle/mutetrack.c | 62 +++++++++++++++++++----------------- dlls/dmstyle/style.c | 69 +++++++++++++++++++++------------------- dlls/dmstyle/styletrack.c | 62 +++++++++++++++++++----------------- 8 files changed, 235 insertions(+), 264 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=40feb043b1fd8dfb596…

1 0

Alexandre Julliard : dmscript: Make the virtual table functions static where possible.
by Alexandre Julliard June 10, 2006

June 10, 2006

Module: wine Branch: refs/heads/master Commit: 06ff754a953446f66cc1b414659a1892936fd0a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=06ff754a953446f66cc1b41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 10 11:56:19 2006 +0200 dmscript: Make the virtual table functions static where possible. --- dlls/dmscript/dmscript_private.h | 18 ----------- dlls/dmscript/script.c | 65 ++++++++++++++++++++------------------ dlls/dmscript/scripttrack.c | 62 +++++++++++++++++++----------------- 3 files changed, 68 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=06ff754a953446f66cc…

1 0

Alexandre Julliard : dmloader: Make the virtual table functions static where possible.
by Alexandre Julliard June 10, 2006

June 10, 2006

Module: wine Branch: refs/heads/master Commit: 12179978fb25e422ca4c5dc6768b7a7e332b24fb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12179978fb25e422ca4c5dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 10 11:56:03 2006 +0200 dmloader: Make the virtual table functions static where possible. --- dlls/dmloader/classfactory.c | 24 +++--- dlls/dmloader/container.c | 40 +++++----- dlls/dmloader/dmloader_private.h | 46 ----------- dlls/dmloader/loader.c | 36 +++++---- dlls/dmloader/loaderstream.c | 156 +++++++++++++++++--------------------- 5 files changed, 125 insertions(+), 177 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=12179978fb25e422ca4…

1 0

Alexandre Julliard : dmcompos: Make the virtual table functions static where possible.
by Alexandre Julliard June 10, 2006

June 10, 2006

Module: wine Branch: refs/heads/master Commit: 4358b4d8e14a193c356086c1939d3e1809dfb957 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4358b4d8e14a193c356086c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 10 11:55:30 2006 +0200 dmcompos: Make the virtual table functions static where possible. --- dlls/dmcompos/chordmap.c | 13 +++++++++---- dlls/dmcompos/chordmaptrack.c | 10 +++++++--- dlls/dmcompos/composer.c | 4 ++-- dlls/dmcompos/dmcompos_private.h | 27 --------------------------- dlls/dmcompos/signposttrack.c | 10 +++++++--- 5 files changed, 25 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4358b4d8e14a193c356…

1 0

Alexandre Julliard : d3d9: Make the virtual table functions static where possible.
by Alexandre Julliard June 10, 2006

June 10, 2006

Module: wine Branch: refs/heads/master Commit: c30d4ecd81be644ce70ab7b1b2636a9d9017f538 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c30d4ecd81be644ce70ab7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 10 11:51:05 2006 +0200 d3d9: Make the virtual table functions static where possible. --- dlls/d3d9/basetexture.c | 32 ++++---- dlls/d3d9/cubetexture.c | 46 ++++++----- dlls/d3d9/d3d9_private.h | 105 -------------------------- dlls/d3d9/device.c | 166 +++++++++++++++++++++-------------------- dlls/d3d9/directx.c | 32 ++++---- dlls/d3d9/indexbuffer.c | 30 ++++--- dlls/d3d9/pixelshader.c | 12 +-- dlls/d3d9/query.c | 18 ++-- dlls/d3d9/resource.c | 22 +++-- dlls/d3d9/stateblock.c | 14 ++- dlls/d3d9/surface.c | 34 ++++---- dlls/d3d9/swapchain.c | 22 +++-- dlls/d3d9/texture.c | 46 ++++++----- dlls/d3d9/vertexbuffer.c | 30 ++++--- dlls/d3d9/vertexdeclaration.c | 12 +-- dlls/d3d9/vertexshader.c | 12 +-- dlls/d3d9/volume.c | 24 +++--- dlls/d3d9/volumetexture.c | 46 ++++++----- 18 files changed, 299 insertions(+), 404 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c30d4ecd81be644ce70…

1 0

Alexandre Julliard : d3dx8: Make the virtual table functions static where possible.
by Alexandre Julliard June 10, 2006

June 10, 2006

Module: wine Branch: refs/heads/master Commit: a34074c5dbe6aa68256bac62ad3d0c6284c65123 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a34074c5dbe6aa68256bac6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 10 11:50:26 2006 +0200 d3dx8: Make the virtual table functions static where possible. --- dlls/d3dx8/d3dx8core_private.h | 22 ---------------------- dlls/d3dx8/d3dxbuffer.c | 13 +++++++------ 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx8/d3dx8core_private.h b/dlls/d3dx8/d3dx8core_private.h index 7b83ffa..fb98b38 100644 --- a/dlls/d3dx8/d3dx8core_private.h +++ b/dlls/d3dx8/d3dx8core_private.h @@ -54,25 +54,11 @@ struct ID3DXBufferImpl DWORD bufferSize; }; -/* IUnknown: */ -extern HRESULT WINAPI ID3DXBufferImpl_QueryInterface(LPD3DXBUFFER iface, REFIID refiid, LPVOID *obj); -extern ULONG WINAPI ID3DXBufferImpl_AddRef(LPD3DXBUFFER iface); -extern ULONG WINAPI ID3DXBufferImpl_Release(LPD3DXBUFFER iface); - -/* ID3DXBuffer: */ -extern LPVOID WINAPI ID3DXBufferImpl_GetBufferPointer(LPD3DXBUFFER iface); -extern DWORD WINAPI ID3DXBufferImpl_GetBufferSize(LPD3DXBUFFER iface); - /* --------- */ /* ID3DXFont */ /* --------- */ /***************************************************************************** - * Predeclare the interface implementation structures - */ -extern const ID3DXFontVtbl D3DXFont_Vtbl; - -/***************************************************************************** * ID3DXFontImpl implementation structure */ struct ID3DXFontImpl @@ -84,12 +70,4 @@ struct ID3DXFontImpl /* ID3DXFont fields */ }; -/* IUnknown: */ -extern HRESULT WINAPI ID3DXFontImpl_QueryInterface(LPD3DXFONT iface, REFIID refiid, LPVOID *obj); -extern ULONG WINAPI ID3DXFontImpl_AddRef(LPD3DXFONT iface); -extern ULONG WINAPI ID3DXFontImpl_Release(LPD3DXFONT iface); - -/* ID3DXFont: */ -extern INT WINAPI ID3DXFontImpl_DrawTextA(LPCSTR pString, INT Count, LPRECT pRect, DWORD Format, D3DCOLOR Color); - #endif /*__WINE_D3DX8CORE_PRIVATE_H */ diff --git a/dlls/d3dx8/d3dxbuffer.c b/dlls/d3dx8/d3dxbuffer.c index a07618b..6d0a780 100644 --- a/dlls/d3dx8/d3dxbuffer.c +++ b/dlls/d3dx8/d3dxbuffer.c @@ -23,6 +23,7 @@ #include "wine/port.h" #include <stdarg.h> +#define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -35,12 +36,12 @@ #include "d3dx8core_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* ID3DXBuffer IUnknown parts follow: */ -HRESULT WINAPI ID3DXBufferImpl_QueryInterface(LPD3DXBUFFER iface, REFIID riid, LPVOID* ppobj) { +static HRESULT WINAPI ID3DXBufferImpl_QueryInterface(LPD3DXBUFFER iface, REFIID riid, LPVOID* ppobj) { ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXBuffer)) { - ID3DXBufferImpl_AddRef(iface); + IUnknown_AddRef(iface); *ppobj = This; return D3D_OK; } @@ -49,7 +50,7 @@ HRESULT WINAPI ID3DXBufferImpl_QueryInte return E_NOINTERFACE; } -ULONG WINAPI ID3DXBufferImpl_AddRef(LPD3DXBUFFER iface) { +static ULONG WINAPI ID3DXBufferImpl_AddRef(LPD3DXBUFFER iface) { ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; ULONG ref = InterlockedIncrement(&This->ref); @@ -58,7 +59,7 @@ ULONG WINAPI ID3DXBufferImpl_AddRef(LPD3 return ref; } -ULONG WINAPI ID3DXBufferImpl_Release(LPD3DXBUFFER iface) { +static ULONG WINAPI ID3DXBufferImpl_Release(LPD3DXBUFFER iface) { ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; ULONG ref = InterlockedDecrement(&This->ref); @@ -72,12 +73,12 @@ ULONG WINAPI ID3DXBufferImpl_Release(LPD } /* ID3DXBuffer Interface follow: */ -LPVOID WINAPI ID3DXBufferImpl_GetBufferPointer(LPD3DXBUFFER iface) { +static LPVOID WINAPI ID3DXBufferImpl_GetBufferPointer(LPD3DXBUFFER iface) { ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; return This->buffer; } -DWORD WINAPI ID3DXBufferImpl_GetBufferSize(LPD3DXBUFFER iface) { +static DWORD WINAPI ID3DXBufferImpl_GetBufferSize(LPD3DXBUFFER iface) { ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; return This->bufferSize; }

1 0

Alexandre Julliard : d3d8: Make the virtual table functions static where possible.
by Alexandre Julliard June 10, 2006

June 10, 2006

Module: wine Branch: refs/heads/master Commit: c3bd09e563a6a6b0864c4a788f700c3f7e63851a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c3bd09e563a6a6b0864c4a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 10 11:48:24 2006 +0200 d3d8: Make the virtual table functions static where possible. --- dlls/d3d8/basetexture.c | 28 +++--- dlls/d3d8/cubetexture.c | 38 ++++----- dlls/d3d8/d3d8_private.h | 5 - dlls/d3d8/device.c | 196 +++++++++++++++++++++++---------------------- dlls/d3d8/directx.c | 34 ++++---- dlls/d3d8/indexbuffer.c | 28 +++--- dlls/d3d8/pixelshader.c | 10 +- dlls/d3d8/resource.c | 20 ++--- dlls/d3d8/stateblock.c | 12 +-- dlls/d3d8/surface.c | 22 +++-- dlls/d3d8/swapchain.c | 10 +- dlls/d3d8/texture.c | 38 ++++----- dlls/d3d8/vertexbuffer.c | 28 +++--- dlls/d3d8/vertexshader.c | 10 +- dlls/d3d8/volume.c | 24 +++--- dlls/d3d8/volumetexture.c | 38 ++++----- 16 files changed, 268 insertions(+), 273 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c3bd09e563a6a6b0864…

1 0

Andrew Talbot : x11drv: Write-strings warnings fix.
by Alexandre Julliard June 9, 2006

June 9, 2006

Module: wine Branch: refs/heads/master Commit: 02731de430179d90acc15ef2a4a594932fa9072b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=02731de430179d90acc15ef… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jun 9 12:44:39 2006 +0100 x11drv: Write-strings warnings fix. --- dlls/x11drv/keyboard.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c index 9b2c6cf..459101b 100644 --- a/dlls/x11drv/keyboard.c +++ b/dlls/x11drv/keyboard.c @@ -1367,7 +1367,7 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent Str[ascii_chars] = '\0'; if (TRACE_ON(key)){ - char *ksname; + const char *ksname; wine_tsx11_lock(); ksname = XKeysymToString(keysym); @@ -1710,7 +1710,7 @@ #if 0 /* this breaks VK_OEM_x VKeys in s TRACE("("); for (i = 0; i < keysyms_per_keycode; i += 1) { - char *ksname; + const char *ksname; keysym = XLookupKeysym(&e2, i); ksname = XKeysymToString(keysym); @@ -1731,7 +1731,7 @@ #endif /* If some keys still lack scancodes, assign some arbitrary ones to them now */ for (scan = 0x60, keyc = min_keycode; keyc <= max_keycode; keyc++) if (keyc2vkey[keyc]&&!keyc2scan[keyc]) { - char *ksname; + const char *ksname; keysym = XKeycodeToKeysym(display, keyc, 0); ksname = XKeysymToString(keysym); if (!ksname) ksname = "NoSymbol"; @@ -2445,7 +2445,7 @@ #endif } else { - char *ksname; + const char *ksname; wine_tsx11_lock(); ksname = XKeysymToString(keysym);

1 0

Detlef Riekenberg : winspool: Add GetPrintProcessorDirectoryA.
by Alexandre Julliard June 9, 2006

June 9, 2006

Module: wine Branch: refs/heads/master Commit: 94543cb6307decc9b8971553266d17a19bafea84 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=94543cb6307decc9b897155… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jun 9 13:06:41 2006 +0200 winspool: Add GetPrintProcessorDirectoryA. --- dlls/winspool.drv/info.c | 42 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 3214ca1..dc8bd79 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1831,17 +1831,47 @@ end: * * See GetPrintProcessorDirectoryW. * - * NOTES - * On NT, the returned ANSI-Data need the same Size as the Unicode-Version * */ BOOL WINAPI GetPrintProcessorDirectoryA(LPSTR server, LPSTR env, DWORD level, LPBYTE Info, - DWORD cbBuf, LPDWORD needed) + DWORD cbBuf, LPDWORD pcbNeeded) { - FIXME("(%s,%s,%ld,%p,0x%08lx): stub\n", debugstr_a(server), debugstr_a(env), - level, Info, cbBuf); - return 0; + LPWSTR serverW = NULL; + LPWSTR envW = NULL; + BOOL ret; + INT len; + + TRACE("(%s, %s, %ld, %p, %ld, %p)\n", debugstr_a(server), + debugstr_a(env), level, Info, cbBuf, pcbNeeded); + + + if (server) { + len = MultiByteToWideChar(CP_ACP, 0, server, -1, NULL, 0); + serverW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, server, -1, serverW, len); + } + + if (env) { + len = MultiByteToWideChar(CP_ACP, 0, env, -1, NULL, 0); + envW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, env, -1, envW, len); + } + + /* NT requires the buffersize from GetPrintProcessorDirectoryW also + for GetPrintProcessorDirectoryA and WC2MB is done in-place. + */ + ret = GetPrintProcessorDirectoryW(serverW, envW, level, Info, + cbBuf, pcbNeeded); + + if (ret) ret = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)Info, -1, (LPSTR)Info, + cbBuf, NULL, NULL) > 0; + + + TRACE(" required: 0x%lx/%ld\n", pcbNeeded ? *pcbNeeded : 0, pcbNeeded ? *pcbNeeded : 0); + HeapFree(GetProcessHeap(), 0, envW); + HeapFree(GetProcessHeap(), 0, serverW); + return ret; } /*****************************************************************************

1 0