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

Stefan Dösinger : wined3d: Implement GetHWND and SetHWND.
by Alexandre Julliard April 19, 2006

April 19, 2006

Module: wine Branch: refs/heads/master Commit: 04da3ce2d172e4240b44e97d90745b50d88f17f7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=04da3ce2d172e4240b44e97… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 18 23:39:52 2006 +0200 wined3d: Implement GetHWND and SetHWND. --- dlls/wined3d/device.c | 12 ++++++++---- dlls/wined3d/wined3d_private.h | 5 ++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dd2805c..93acc84 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4992,15 +4992,19 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetDis } HRESULT WINAPI IWineD3DDeviceImpl_SetHWND(IWineD3DDevice *iface, HWND hWnd) { - FIXME("This is unimplemented for now(d3d7 merge)\n"); + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + TRACE("(%p)->(%p)\n", This, hWnd); - return WINED3DERR_INVALIDCALL; + This->ddraw_window = hWnd; + return WINED3D_OK; } HRESULT WINAPI IWineD3DDeviceImpl_GetHWND(IWineD3DDevice *iface, HWND *hWnd) { - FIXME("This is unimplemented for now(d3d7 merge)\n"); + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + TRACE("(%p)->(%p)\n", This, hWnd); - return WINED3DERR_INVALIDCALL; + *hWnd = This->ddraw_window; + return WINED3D_OK; } /***** diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index afb769c..55a92f7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -583,7 +583,10 @@ #define NEEDS_DI /* process vertex shaders using software or hardware */ BOOL softwareVertexProcessing; - + + /* DirectDraw stuff */ + HWND ddraw_window; + } IWineD3DDeviceImpl; extern const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl;

1 0

Stefan Dösinger : wined3d: Implement EnumTextureFormats.
by Alexandre Julliard April 19, 2006

April 19, 2006

Module: wine Branch: refs/heads/master Commit: 7fee88df9fbef3c4924174448d64653434377354 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7fee88df9fbef3c49241744… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 18 23:22:24 2006 +0200 wined3d: Implement EnumTextureFormats. --- dlls/wined3d/device.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f24021b..dd2805c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1847,8 +1847,55 @@ HRESULT WINAPI IWineD3DDeviceImpl_EnumZB } HRESULT WINAPI IWineD3DDeviceImpl_EnumTextureFormats(IWineD3DDevice *iface, D3DCB_ENUMPIXELFORMATS Callback, void *Context) { - FIXME("This call is a d3d7 merge stub. It will be implemented later\n"); - return WINED3DERR_INVALIDCALL; + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + HRESULT ret; + int i = 0; + + /* From old ddraw: + * WINED3DFMT_A1R5G5B5 needs to be the first 16 bit format, as some dumb apps depend on this + * + * Do not enumerate RGBA pixel formats: "some games choose the first 16 bit texture format + * with alpha they find enumerated, others the last one. And both want to have the ARGB one." + * But WineD3D doesn't support RGBA formats anyway... + */ + + WINED3DFORMAT FormatList[] = { + /* 32 bit */ + WINED3DFMT_A8R8G8B8, + WINED3DFMT_X8R8G8B8, + /* 24 bit */ + WINED3DFMT_R8G8B8, + /* 16 Bit */ + WINED3DFMT_A1R5G5B5, + WINED3DFMT_A4R4G4B4, + WINED3DFMT_R5G6B5, + WINED3DFMT_X1R5G5B5, + /* 8 Bit */ + WINED3DFMT_R3G3B2, + WINED3DFMT_P8, + /* FOURCC codes */ + WINED3DFMT_DXT1, + WINED3DFMT_DXT3, + WINED3DFMT_DXT5, + /* Terminate the list */ + WINED3DFMT_UNKNOWN + }; + + TRACE("(%p)->(%p,%p)\n", This, Callback, Context); + + while(FormatList[i] != WINED3DFMT_UNKNOWN) { + TRACE("Enumerating %s\n", debug_d3dformat(FormatList[i])); + ret = Callback((IUnknown *) This, FormatList[i], Context); + if(ret != DDENUMRET_OK) { + TRACE("Enumeration cancelled by Application\n"); + return WINED3D_OK; + } + i++; + } + + TRACE("End of Enumeration\n"); + + return WINED3D_OK; } HRESULT WINAPI IWineD3DDeviceImpl_GetDirect3D(IWineD3DDevice *iface, IWineD3D **ppD3D) {

1 0

Stefan Dösinger : wined3d: Implement EnumZBufferFormats.
by Alexandre Julliard April 19, 2006

April 19, 2006

Module: wine Branch: refs/heads/master Commit: ac964c3b6185a86d6fa667cecf48c0c5a5c67096 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac964c3b6185a86d6fa667c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 18 23:15:56 2006 +0200 wined3d: Implement EnumZBufferFormats. --- dlls/wined3d/device.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 667ee6c..f24021b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1,10 +1,12 @@ /* * IWineD3DDevice implementation * + * Copyright 2002 Lionel Ulmer * Copyright 2002-2005 Jason Edmeades * Copyright 2003-2004 Raphael Junqueira * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber + * Copyright 2006 Stefan D�singer for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1814,8 +1816,34 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetDis } HRESULT WINAPI IWineD3DDeviceImpl_EnumZBufferFormats(IWineD3DDevice *iface, D3DCB_ENUMPIXELFORMATS Callback, void *Context) { - FIXME("This call is a d3d7 merge stub. It will be implemented later\n"); - return WINED3DERR_INVALIDCALL; + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + HRESULT ret; + int i = 0; + WINED3DFORMAT FormatList[] = { + WINED3DFMT_D16, + WINED3DFMT_D32, + WINED3DFMT_D24X4S4, + WINED3DFMT_D24S8, + WINED3DFMT_D24X8, + WINED3DFMT_D15S1, + WINED3DFMT_UNKNOWN /* Terminate the list */ + }; + + TRACE("(%p)->(%p,%p)\n", This, Callback, Context); + + while(FormatList[i] != WINED3DFMT_UNKNOWN) { + TRACE("Enumerating %s\n", debug_d3dformat(FormatList[i])); + ret = Callback((IUnknown *) This, FormatList[i], Context); + if(ret != DDENUMRET_OK) { + TRACE("Enumeration cancelled by Application\n"); + return WINED3D_OK; + } + i++; + } + + TRACE("End of Enumeration\n"); + + return WINED3D_OK; } HRESULT WINAPI IWineD3DDeviceImpl_EnumTextureFormats(IWineD3DDevice *iface, D3DCB_ENUMPIXELFORMATS Callback, void *Context) {

1 0

Stefan Dösinger : wined3d: Implement IWineD3DDevice:: EnumDisplayModes.
by Alexandre Julliard April 19, 2006

April 19, 2006

Module: wine Branch: refs/heads/master Commit: a6206836e662a4a20013189f837ef3c7b88788d7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a6206836e662a4a20013189… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 18 23:04:51 2006 +0200 wined3d: Implement IWineD3DDevice::EnumDisplayModes. --- dlls/wined3d/device.c | 22 ++++++++++++++++++++-- dlls/wined3d/utils.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 15a6fc8..667ee6c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1786,8 +1786,26 @@ HRESULT WINAPI IWineD3DDeviceImpl_Uninit } HRESULT WINAPI IWineD3DDeviceImpl_EnumDisplayModes(IWineD3DDevice *iface, DWORD Flags, UINT Width, UINT Height, WINED3DFORMAT pixelformat, LPVOID context, D3DCB_ENUMDISPLAYMODESCALLBACK callback) { - FIXME("This call is a d3d7 merge stub. It will be implemented later\n"); - return WINED3DERR_INVALIDCALL; + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + + DEVMODEW DevModeW; + int i; + + TRACE("(%p)->(%lx,%d,%d,%d,%p,%p)\n", This, Flags, Width, Height, pixelformat, context, callback); + + for (i = 0; EnumDisplaySettingsExW(NULL, i, &DevModeW, 0); i++) { + /* Ignore some modes if a description was passed */ + if ( (Width > 0) && (Width != DevModeW.dmPelsWidth)) continue; + if ( (Height > 0) && (Height != DevModeW.dmPelsHeight)) continue; + if ( (pixelformat != WINED3DFMT_UNKNOWN) && ( D3DFmtGetBpp(NULL, pixelformat) != DevModeW.dmBitsPerPel) ) continue; + + TRACE("Enumerating %ldx%ld@%s\n", DevModeW.dmPelsWidth, DevModeW.dmPelsHeight, debug_d3dformat(pixelformat_for_depth(DevModeW.dmBitsPerPel))); + + if (callback((IUnknown *) This, (UINT) DevModeW.dmPelsWidth, (UINT) DevModeW.dmPelsHeight, pixelformat_for_depth(DevModeW.dmBitsPerPel), 60.0, context) == DDENUMRET_CANCEL) + return D3D_OK; + } + + return D3D_OK; } HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, UINT iSwapChain, WINED3DDISPLAYMODE* pMode) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b38db42..cfc244a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2041,3 +2041,15 @@ #define PUSH2(att,value) attribs[(*nAtt } #undef GLINFO_LOCATION + +/* DirectDraw stuff */ +WINED3DFORMAT pixelformat_for_depth(DWORD depth) { + switch(depth) { + case 8: return D3DFMT_P8; break; + case 15: return WINED3DFMT_X1R5G5B5; break; + case 16: return WINED3DFMT_R5G6B5; break; + case 24: return WINED3DFMT_R8G8B8; break; + case 32: return WINED3DFMT_X8R8G8B8; break; + default: return WINED3DFMT_UNKNOWN; + } +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0553998..afb769c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1283,4 +1283,7 @@ struct IWineD3DPaletteImpl { extern const IWineD3DPaletteVtbl IWineD3DPalette_Vtbl; +/* DirectDraw utility functions */ +extern WINED3DFORMAT pixelformat_for_depth(DWORD depth); + #endif

1 0

Stefan Dösinger : wined3d: Implement Init3D and Uninit3D.
by Alexandre Julliard April 19, 2006

April 19, 2006

Module: wine Branch: refs/heads/master Commit: d04f0507cf3b8847058e386063fd5cae425ae1fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d04f0507cf3b8847058e386… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 18 22:38:30 2006 +0200 wined3d: Implement Init3D and Uninit3D. --- dlls/d3d8/device.c | 2 dlls/d3d8/directx.c | 4 - dlls/d3d9/device.c | 2 dlls/d3d9/directx.c | 6 - dlls/wined3d/device.c | 239 ++++++++++++++++++++++++++------------ dlls/wined3d/directx.c | 115 +++--------------- dlls/wined3d/wined3d_private.h | 5 + include/wine/wined3d_interface.h | 4 - 8 files changed, 195 insertions(+), 182 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d04f0507cf3b8847058…

1 0

James Hawkins : advpack: Set the destination directory to the working directory if key equals SourceDir .
by Alexandre Julliard April 19, 2006

April 19, 2006

Module: wine Branch: refs/heads/master Commit: b9fc3f8eb1064df6a624512a90c2d9b4bb335a1f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b9fc3f8eb1064df6a624512… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Apr 18 16:14:34 2006 -0500 advpack: Set the destination directory to the working directory if key equals SourceDir. --- dlls/advpack/advpack.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 3ceb70a..791cb88 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -92,7 +92,7 @@ static void get_dest_dir(HINF hInf, PCWS } /* loads the LDIDs specified in the install section of an INF */ -static void set_ldids(HINF hInf, LPCWSTR pszInstallSection) +static void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) { WCHAR field[MAX_FIELD_LENGTH]; WCHAR line[MAX_FIELD_LENGTH]; @@ -101,6 +101,8 @@ static void set_ldids(HINF hInf, LPCWSTR DWORD size; int ldid; + static const WCHAR source_dir[] = {'S','o','u','r','c','e','D','i','r',0}; + static const WCHAR custDestW[] = { 'C','u','s','t','o','m','D','e','s','t','i','n','a','t','i','o','n',0 }; @@ -145,7 +147,11 @@ static void set_ldids(HINF hInf, LPCWSTR if (ptr) *ptr = '\0'; - get_dest_dir(hInf, value, dest, MAX_PATH); + /* set dest to pszWorkingDir if key is SourceDir */ + if (pszWorkingDir && !lstrcmpiW(value, source_dir)) + lstrcpynW(dest, pszWorkingDir, MAX_PATH); + else + get_dest_dir(hInf, value, dest, MAX_PATH); /* set all ldids to dest */ while ((ptr = get_parameter(&key, ','))) @@ -359,7 +365,7 @@ HRESULT WINAPI OpenINFEngineW(LPCWSTR ps if (*phInf == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - set_ldids(*phInf, pszInstallSection); + set_ldids(*phInf, pszInstallSection, NULL); return S_OK; } @@ -717,7 +723,7 @@ HRESULT WINAPI TranslateInfStringW(LPCWS if (hInf == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - set_ldids(hInf, pszInstallSection); + set_ldids(hInf, pszInstallSection, NULL); if (!SetupGetLineTextW(NULL, hInf, pszTranslateSection, pszTranslateKey, pszBuffer, dwBufferSize, pdwRequiredSize))

1 0

James Hawkins : advpack: Add the ability to set multiple keys on one line in set_ldid.
by Alexandre Julliard April 19, 2006

April 19, 2006

Module: wine Branch: refs/heads/master Commit: fc52a8483c254c3f3edbae0e83c922c76388b211 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fc52a8483c254c3f3edbae0… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Apr 18 16:14:05 2006 -0500 advpack: Add the ability to set multiple keys on one line in set_ldid. --- dlls/advpack/advpack.c | 43 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 38 insertions(+), 5 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 297dfca..3ceb70a 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -95,7 +95,7 @@ static void get_dest_dir(HINF hInf, PCWS static void set_ldids(HINF hInf, LPCWSTR pszInstallSection) { WCHAR field[MAX_FIELD_LENGTH]; - WCHAR key[MAX_FIELD_LENGTH]; + WCHAR line[MAX_FIELD_LENGTH]; WCHAR dest[MAX_PATH]; INFCONTEXT context; DWORD size; @@ -114,13 +114,46 @@ static void set_ldids(HINF hInf, LPCWSTR do { - SetupGetIntField(&context, 0, &ldid); + LPWSTR value, ptr, key, key_copy = NULL; + SetupGetLineTextW(&context, NULL, NULL, NULL, - key, MAX_FIELD_LENGTH, &size); + line, MAX_FIELD_LENGTH, &size); + + /* SetupGetLineTextW returns the value if there is only one key, but + * returns the whole line if there is more than one key + */ + if (!(value = strchrW(line, '='))) + { + SetupGetStringFieldW(&context, 0, NULL, 0, &size); + key = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + key_copy = key; + SetupGetStringFieldW(&context, 0, key, size, &size); + value = line; + } + else + { + key = line; + *(value++) = '\0'; + } + + /* remove leading whitespace from the value */ + while (*value == ' ') + value++; + + /* FIXME: need to check the query option */ + ptr = strchrW(value, ','); + if (ptr) + *ptr = '\0'; - get_dest_dir(hInf, key, dest, MAX_PATH); + get_dest_dir(hInf, value, dest, MAX_PATH); - SetupSetDirectoryIdW(hInf, ldid, dest); + /* set all ldids to dest */ + while ((ptr = get_parameter(&key, ','))) + { + ldid = atolW(ptr); + SetupSetDirectoryIdW(hInf, ldid, dest); + } + HeapFree(GetProcessHeap(), 0, key_copy); } while (SetupFindNextLine(&context, &context)); }

1 0

James Hawkins : advpack: Put function declarations in advpack_private.h.
by Alexandre Julliard April 19, 2006

April 19, 2006

Module: wine Branch: refs/heads/master Commit: b2a3ffd893413726cdff14df5c6dac2360b4ecf2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b2a3ffd893413726cdff14d… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Apr 18 16:13:26 2006 -0500 advpack: Put function declarations in advpack_private.h. --- dlls/advpack/advpack.c | 3 +-- dlls/advpack/advpack_private.h | 29 +++++++++++++++++++++++++++++ dlls/advpack/files.c | 3 +-- dlls/advpack/install.c | 1 + 4 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 dlls/advpack/advpack_private.h diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index f68ab2b..297dfca 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -32,6 +32,7 @@ #include "setupapi.h" #include "advpub.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "advpack_private.h" WINE_DEFAULT_DEBUG_CHANNEL(advpack); @@ -40,8 +41,6 @@ typedef HRESULT (WINAPI *DLLREGISTER) (v #define MAX_FIELD_LENGTH 512 #define PREFIX_LEN 5 -HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE); - /* registry path of the Installed Components key for per-user stubs */ static const WCHAR setup_key[] = { 'S','O','F','T','W','A','R','E','\\', diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h new file mode 100644 index 0000000..a36b32b --- /dev/null +++ b/dlls/advpack/advpack_private.h @@ -0,0 +1,29 @@ +/* + * Advpack private header + * + * Copyright 2006 James Hawkins + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __ADVPACK_PRIVATE_H +#define __ADVPACK_PRIVATE_H + +LPWSTR get_parameter(LPWSTR *params, WCHAR separator); + +HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE); +HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg); + +#endif /* __ADVPACK_PRIVATE_H */ diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 90ba6cd..7e0706e 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -31,11 +31,10 @@ #include "setupapi.h" #include "advpub.h" #include "wine/debug.h" #include "wine/unicode.h" +#include "advpack_private.h" WINE_DEFAULT_DEBUG_CHANNEL(advpack); -LPWSTR get_parameter(LPWSTR *params, WCHAR separator); - /* converts an ansi double null-terminated list to a unicode list */ static LPWSTR ansi_to_unicode_list(LPCSTR ansi_list) { diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index aeae7cd..eeffa9e 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -32,6 +32,7 @@ #include "setupapi.h" #include "advpub.h" #include "wine/debug.h" #include "wine/unicode.h" +#include "advpack_private.h" WINE_DEFAULT_DEBUG_CHANNEL(advpack);

1 0

Mike McCormack : rpcrt4: Stub implementation for rpcrt4. RpcMgmtEpEltInqBegin().
by Alexandre Julliard April 19, 2006

April 19, 2006

Module: wine Branch: refs/heads/master Commit: a0f8623e2e4551214df4ac044210051833dcdae1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a0f8623e2e4551214df4ac0… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Apr 19 17:25:21 2006 +0900 rpcrt4: Stub implementation for rpcrt4.RpcMgmtEpEltInqBegin(). --- dlls/rpcrt4/rpc_server.c | 14 ++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- include/rpcdce.h | 17 +++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 45d0dff..d8eaa6b 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1051,8 +1051,22 @@ UINT WINAPI I_RpcWindowProc( void *hWnd, return 0; } +/*********************************************************************** + * RpcMgmtInqIfIds (RPCRT4.@) + */ RPC_STATUS WINAPI RpcMgmtInqIfIds(RPC_BINDING_HANDLE Binding, RPC_IF_ID_VECTOR **IfIdVector) { FIXME("(%p,%p): stub\n", Binding, IfIdVector); return RPC_S_INVALID_BINDING; } + +/*********************************************************************** + * RpcMgmtEpEltInqBegin (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcMgmtEpEltInqBegin(RPC_BINDING_HANDLE Binding, unsigned long InquiryType, + RPC_IF_ID *IfId, unsigned long VersOption, UUID *ObjectUuid, RPC_EP_INQ_HANDLE* InquiryContext) +{ + FIXME("(%p,%lu,%p,%lu,%p,%p): stub\n", + Binding, InquiryType, IfId, VersOption, ObjectUuid, InquiryContext); + return RPC_S_INVALID_BINDING; +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index d5d8f52..d2618a9 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -424,7 +424,7 @@ # 9x version of I_RpcBindingSetAsync has @ stub RpcMgmtBindingInqParameter # win9x @ stub RpcMgmtBindingSetParameter # win9x @ stub RpcMgmtEnableIdleCleanup -@ stub RpcMgmtEpEltInqBegin +@ stdcall RpcMgmtEpEltInqBegin(ptr long ptr long ptr ptr) @ stub RpcMgmtEpEltInqDone @ stub RpcMgmtEpEltInqNextA @ stub RpcMgmtEpEltInqNextW diff --git a/include/rpcdce.h b/include/rpcdce.h index 77a5c2f..68cc7ad 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -77,6 +77,19 @@ typedef struct RPC_IF_ID *IfId[1]; } RPC_IF_ID_VECTOR; +typedef I_RPC_HANDLE *RPC_EP_INQ_HANDLE; + +#define RPC_C_EP_ALL_ELTS 0 +#define RPC_C_EP_MATCH_BY_IF 1 +#define RPC_C_EP_MATCH_BY_OBJ 2 +#define RPC_C_EP_MATCH_BY_BOTH 3 + +#define RPC_C_VERS_ALL 1 +#define RPC_C_VERS_COMPATIBLE 2 +#define RPC_C_VERS_EXACT 3 +#define RPC_C_VERS_MAJOR_ONLY 4 +#define RPC_C_VERS_UPTO 5 + #define RPC_C_BINDING_INFINITE_TIMEOUT 10 #define RPC_C_BINDING_MIN_TIMEOUT 0 #define RPC_C_BINDING_DEFAULT_TIMEOUT 5 @@ -241,6 +254,10 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtInqIfIds( RPC_BINDING_HANDLE Binding, RPC_IF_ID_VECTOR** IfIdVector ); RPCRTAPI RPC_STATUS RPC_ENTRY + RpcMgmtEpEltInqBegin( RPC_BINDING_HANDLE EpBinding, unsigned long InquiryType, RPC_IF_ID *IfId, + unsigned long VersOption, UUID *ObjectUuid, RPC_EP_INQ_HANDLE *InquiryContext); + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcServerRegisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv ); RPCRTAPI RPC_STATUS RPC_ENTRY

1 0

Mike McCormack : rpcrt4: Add a stub implementation for rpcrt4. RpcMgmtInqIfIds().
by Alexandre Julliard April 19, 2006

April 19, 2006

Module: wine Branch: refs/heads/master Commit: f0c49daedf0a3206ef78c75eeba7c2ea9a2efb7a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f0c49daedf0a3206ef78c75… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Apr 19 17:25:02 2006 +0900 rpcrt4: Add a stub implementation for rpcrt4.RpcMgmtInqIfIds(). --- dlls/rpcrt4/rpc_server.c | 6 ++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- include/rpcdce.h | 9 +++++++++ 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 87171f5..45d0dff 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1050,3 +1050,9 @@ UINT WINAPI I_RpcWindowProc( void *hWnd, return 0; } + +RPC_STATUS WINAPI RpcMgmtInqIfIds(RPC_BINDING_HANDLE Binding, RPC_IF_ID_VECTOR **IfIdVector) +{ + FIXME("(%p,%p): stub\n", Binding, IfIdVector); + return RPC_S_INVALID_BINDING; +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index ad4e04f..d5d8f52 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -431,7 +431,7 @@ # 9x version of I_RpcBindingSetAsync has @ stub RpcMgmtEpUnregister @ stub RpcMgmtInqComTimeout @ stub RpcMgmtInqDefaultProtectLevel -@ stub RpcMgmtInqIfIds +@ stdcall RpcMgmtInqIfIds(ptr ptr) @ stub RpcMgmtInqParameter # win9x @ stub RpcMgmtInqServerPrincNameA @ stub RpcMgmtInqServerPrincNameW diff --git a/include/rpcdce.h b/include/rpcdce.h index 66df3ea..77a5c2f 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -71,6 +71,12 @@ typedef struct _RPC_IF_ID unsigned short VersMinor; } RPC_IF_ID; +typedef struct +{ + unsigned long Count; + RPC_IF_ID *IfId[1]; +} RPC_IF_ID_VECTOR; + #define RPC_C_BINDING_INFINITE_TIMEOUT 10 #define RPC_C_BINDING_MIN_TIMEOUT 0 #define RPC_C_BINDING_DEFAULT_TIMEOUT 5 @@ -232,6 +238,9 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtStopServerListening( RPC_BINDING_HANDLE Binding ); RPCRTAPI RPC_STATUS RPC_ENTRY + RpcMgmtInqIfIds( RPC_BINDING_HANDLE Binding, RPC_IF_ID_VECTOR** IfIdVector ); + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcServerRegisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv ); RPCRTAPI RPC_STATUS RPC_ENTRY

1 0