wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Henri Verbeet : wined3d: Just remove the D3DCMP_NOTEQUAL / D3DCMP_EQUAL FIXME in state_zfunc().
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 50a386451588615f449e7b3b944530ec3db90976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a386451588615f449e7b3b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 28 08:55:19 2013 +0200 wined3d: Just remove the D3DCMP_NOTEQUAL / D3DCMP_EQUAL FIXME in state_zfunc(). As far as I'm aware this just works, I'm not aware of any open issues related to it. --- dlls/wined3d/state.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index cdccb47..05c49a5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -267,21 +267,6 @@ static void state_zfunc(struct wined3d_context *context, const struct wined3d_st if (!depth_func) return; - if (depth_func == GL_EQUAL || depth_func == GL_NOTEQUAL) - { - static BOOL once; - /* There are a few issues with this: First, our inability to - * select a proper Z depth, most of the time we're stuck with - * D24S8, even if the app selects D32 or D16. There seem to be - * some other precision problems which have to be debugged to - * make NOTEQUAL and EQUAL work properly. */ - if (!once) - { - once = TRUE; - FIXME("D3DCMP_NOTEQUAL and D3DCMP_EQUAL do not work correctly yet.\n"); - } - } - gl_info->gl_ops.gl.p_glDepthFunc(depth_func); checkGLcall("glDepthFunc"); }

1 0

Henri Verbeet : wined3d: Expose WINED3DVTXPCAPS_TEXGEN_SPHEREMAP.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 97b6299eaf882a5702fbbfe48fbc1adbeac4b927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b6299eaf882a5702fbbfe48… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 28 08:55:18 2013 +0200 wined3d: Expose WINED3DVTXPCAPS_TEXGEN_SPHEREMAP. Since we already implement it. Tweening will likely never work with fixed function GL. --- dlls/wined3d/state.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bad4166..cdccb47 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5658,13 +5658,13 @@ static void vp_ffp_get_caps(const struct wined3d_gl_info *gl_info, struct wined3 caps->max_active_lights = gl_info->limits.lights; caps->max_vertex_blend_matrices = gl_info->limits.blends; caps->max_vertex_blend_matrix_index = 0; - /* FIXME: Add D3DVTXPCAPS_TWEENING, D3DVTXPCAPS_TEXGEN_SPHEREMAP */ caps->vertex_processing_caps = WINED3DVTXPCAPS_DIRECTIONALLIGHTS | WINED3DVTXPCAPS_MATERIALSOURCE7 | WINED3DVTXPCAPS_POSITIONALLIGHTS | WINED3DVTXPCAPS_LOCALVIEWER | WINED3DVTXPCAPS_VERTEXFOG - | WINED3DVTXPCAPS_TEXGEN; + | WINED3DVTXPCAPS_TEXGEN + | WINED3DVTXPCAPS_TEXGEN_SPHEREMAP; caps->fvf_caps = WINED3DFVFCAPS_PSIZE | 0x0008; /* 8 texture coords */ caps->max_user_clip_planes = gl_info->limits.clipplanes; caps->raster_caps = 0;

1 0

Henri Verbeet : wined3d: Use debug_d3dstate() in compile_state_table() as well.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: b5df8bd4f5a3b71a0ae300066ee1aaaeeefc94d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5df8bd4f5a3b71a0ae300066… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 28 08:55:17 2013 +0200 wined3d: Use debug_d3dstate() in compile_state_table() as well. --- 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 46ab990..bad4166 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -6021,10 +6021,11 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ cur[i].state, handlers + 1); } - if(StateTable[cur[i].state].representative && - StateTable[cur[i].state].representative != cur[i].content.representative) { - FIXME("State %u has different representatives in different pipeline parts\n", - cur[i].state); + if (StateTable[cur[i].state].representative + && StateTable[cur[i].state].representative != cur[i].content.representative) + { + FIXME("State %s (%#x) has different representatives in different pipeline parts.\n", + debug_d3dstate(cur[i].state), cur[i].state); } StateTable[cur[i].state].representative = cur[i].content.representative; }

1 0

Dan Kegel : kernel32: Make SetThreadPriorityBoost return success.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 073d7212a765ec5c4eff3fbf0ebe553462892fa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=073d7212a765ec5c4eff3fbf0… Author: Dan Kegel <dank(a)kegel.com> Date: Mon May 27 17:08:05 2013 -0700 kernel32: Make SetThreadPriorityBoost return success. --- dlls/kernel32/tests/thread.c | 12 ++++++------ dlls/kernel32/thread.c | 10 +++------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 55014f8..9be0484 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -713,22 +713,22 @@ static VOID test_thread_priority(void) 0,curthreadId); ok(access_thread!=NULL,"OpenThread returned an invalid handle\n"); if (access_thread!=NULL) { - obey_ar(pSetThreadPriorityBoost(access_thread,1)==0); + todo_wine obey_ar(pSetThreadPriorityBoost(access_thread,1)==0); todo_wine obey_ar(pGetThreadPriorityBoost(access_thread,&disabled)==0); ok(CloseHandle(access_thread),"Error Closing thread handle\n"); } } + rc = pSetThreadPriorityBoost(curthread,1); + ok( rc != 0, "error=%d\n",GetLastError()); todo_wine { - rc = pSetThreadPriorityBoost(curthread,1); - ok( rc != 0, "error=%d\n",GetLastError()); rc=pGetThreadPriorityBoost(curthread,&disabled); ok(rc!=0 && disabled==1, "rc=%d error=%d disabled=%d\n",rc,GetLastError(),disabled); - - rc = pSetThreadPriorityBoost(curthread,0); - ok( rc != 0, "error=%d\n",GetLastError()); } + + rc = pSetThreadPriorityBoost(curthread,0); + ok( rc != 0, "error=%d\n",GetLastError()); rc=pGetThreadPriorityBoost(curthread,&disabled); ok(rc!=0 && disabled==0, "rc=%d error=%d disabled=%d\n",rc,GetLastError(),disabled); diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 5702d6c..c82ef58 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -357,18 +357,14 @@ BOOL WINAPI GetThreadPriorityBoost( /********************************************************************** * SetThreadPriorityBoost [KERNEL32.@] Sets priority boost for thread. * - * Priority boost is not implemented. This function always returns - * FALSE and sets last error to ERROR_CALL_NOT_IMPLEMENTED - * - * RETURNS - * Always returns FALSE to indicate a failure + * Priority boost is not implemented, but we return TRUE + * anyway because some games crash otherwise. */ BOOL WINAPI SetThreadPriorityBoost( HANDLE hthread, /* [in] Handle to thread */ BOOL disable) /* [in] TRUE to disable priority boost */ { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return TRUE; }

1 0

Marcus Meissner : ver: curdirlen and destdirlen are in&out parameters ( Coverity).
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 90a9698f16f3063783305d292dbdff2c31ceaa0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=90a9698f16f3063783305d292… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 26 15:49:42 2013 +0200 ver: curdirlen and destdirlen are in&out parameters (Coverity). --- dlls/ver.dll16/version.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/ver.dll16/version.c b/dlls/ver.dll16/version.c index 45b9277..5e6692f 100644 --- a/dlls/ver.dll16/version.c +++ b/dlls/ver.dll16/version.c @@ -494,11 +494,23 @@ DWORD WINAPI VerFindFile16( UINT16 flags, LPSTR lpszFilename, LPSTR lpszDestDir, UINT16 *lpuDestDirLen ) { UINT curDirLen, destDirLen; - DWORD retv = VerFindFileA( flags, lpszFilename, lpszWinDir, lpszAppDir, - lpszCurDir, &curDirLen, lpszDestDir, &destDirLen ); + UINT *pcurDirLen = NULL, *pdestDirLen = NULL; + DWORD retv; - *lpuCurDirLen = (UINT16)curDirLen; - *lpuDestDirLen = (UINT16)destDirLen; + if (lpuCurDirLen) { + curDirLen = *lpuCurDirLen; + pcurDirLen = &curDirLen; + } + if (lpuDestDirLen) { + destDirLen = *lpuDestDirLen; + pdestDirLen = &destDirLen; + } + retv = VerFindFileA( flags, lpszFilename, lpszWinDir, lpszAppDir, + lpszCurDir, pcurDirLen, lpszDestDir, pdestDirLen ); + if (lpuCurDirLen) + *lpuCurDirLen = (UINT16)curDirLen; + if (lpuDestDirLen) + *lpuDestDirLen = (UINT16)destDirLen; return retv; }

1 0

Marcus Meissner : services: Fix handle leak for service handles (Coverity).
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: d82de9b9a7f32a0d093f615ce61ea8f9ff121813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82de9b9a7f32a0d093f615ce… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 26 15:31:51 2013 +0200 services: Fix handle leak for service handles (Coverity). --- programs/services/tests/service.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 99d28eb..a2cd0b5 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -328,6 +328,7 @@ static void test_service(void) ok(res, "StartService failed: %u\n", GetLastError()); if(!res) { DeleteService(service_handle); + CloseServiceHandle(service_handle); return; } expect_event("RUNNING"); @@ -368,6 +369,7 @@ static inline void test_no_stop(void) ok(res, "StartService failed: %u\n", GetLastError()); if(!res) { DeleteService(service_handle); + CloseServiceHandle(service_handle); return; } expect_event("RUNNING");

1 0

Marcus Meissner : wininet/tests: Avoid overflowing the buffer (Coverity).
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 4c20fec04555a1a3053e7414e339fcc67bff9338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c20fec04555a1a3053e7414e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 26 14:40:12 2013 +0200 wininet/tests: Avoid overflowing the buffer (Coverity). --- dlls/wininet/tests/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 60fbe57..b42e732 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -613,7 +613,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) res = InternetQueryOptionA(hor,INTERNET_OPTION_URL,buffer,&length); ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed with error %d\n", GetLastError()); - length = sizeof(buffer); + length = sizeof(buffer)-1; res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length,0x0); ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); buffer[length]=0;

1 0

Marcus Meissner : ws2_32: Close the dest socket (Coverity).
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 1a10d4d0cd27ddf4fca1a4dd910fe7498a7b0f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a10d4d0cd27ddf4fca1a4dd9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 26 14:33:25 2013 +0200 ws2_32: Close the dest socket (Coverity). --- dlls/ws2_32/tests/sock.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 804c66b..4612116 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4176,6 +4176,8 @@ static void test_WSARecv(void) todo_wine ok(!bret && (GetLastError() == ERROR_NETNAME_DELETED || broken(GetLastError() == ERROR_IO_INCOMPLETE) /* win9x */), "Did not get disconnect event: %d, error %d\n", bret, GetLastError()); ok(bytesReturned == 0, "Bytes received is %d\n", bytesReturned); + closesocket(dest); + dest = INVALID_SOCKET; src = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, 0); ok(src != INVALID_SOCKET, "failed to create socket %d\n", WSAGetLastError());

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeLib::CreateTypeInfo.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: d72a797f0067c5be93101171f973ea6892d87070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72a797f0067c5be93101171f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 24 11:28:42 2013 -0500 oleaut32: Implement ICreateTypeLib::CreateTypeInfo. --- dlls/oleaut32/typelib.c | 104 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 85 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 83b503c..c9ee1cd 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1652,6 +1652,18 @@ static inline TLBCustData *TLB_get_custdata_by_guid(struct list *custdata_list, return NULL; } +static inline ITypeInfoImpl *TLB_get_typeinfo_by_name(ITypeInfoImpl **typeinfos, + UINT n, const OLECHAR *name) +{ + while(n){ + if(!lstrcmpiW((*typeinfos)->Name, name)) + return *typeinfos; + ++typeinfos; + --n; + } + return NULL; +} + static TLBVarDesc *TLBVarDesc_Constructor(UINT n) { TLBVarDesc *ret; @@ -5051,31 +5063,25 @@ static HRESULT WINAPI ITypeLibComp_fnBindType( ITypeComp ** ppTComp) { ITypeLibImpl *This = impl_from_ITypeComp(iface); - int i; + ITypeInfoImpl *info; TRACE("(%s, %x, %p, %p)\n", debugstr_w(szName), lHash, ppTInfo, ppTComp); if(!szName || !ppTInfo || !ppTComp) return E_INVALIDARG; - for(i = 0; i < This->TypeInfoCount; ++i) - { - ITypeInfoImpl *pTypeInfo = This->typeinfos[i]; - /* FIXME: should use lHash to do the search */ - if (pTypeInfo->Name && !strcmpiW(pTypeInfo->Name, szName)) - { - TRACE("returning %p\n", pTypeInfo); - *ppTInfo = (ITypeInfo *)&pTypeInfo->ITypeInfo2_iface; - ITypeInfo_AddRef(*ppTInfo); - *ppTComp = &pTypeInfo->ITypeComp_iface; - ITypeComp_AddRef(*ppTComp); - return S_OK; - } + info = TLB_get_typeinfo_by_name(This->typeinfos, This->TypeInfoCount, szName); + if(!info){ + *ppTInfo = NULL; + *ppTComp = NULL; + return S_OK; } - TRACE("not found\n"); - *ppTInfo = NULL; - *ppTComp = NULL; + *ppTInfo = (ITypeInfo *)&info->ITypeInfo2_iface; + ITypeInfo_AddRef(*ppTInfo); + *ppTComp = &info->ITypeComp_iface; + ITypeComp_AddRef(*ppTComp); + return S_OK; } @@ -8102,8 +8108,68 @@ static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo(ICreateTypeLib2 *iface, LPOLESTR name, TYPEKIND kind, ICreateTypeInfo **ctinfo) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s %d %p - stub\n", This, wine_dbgstr_w(name), kind, ctinfo); - return E_NOTIMPL; + ITypeInfoImpl *info; + HRESULT hres; + + TRACE("%p %s %d %p\n", This, wine_dbgstr_w(name), kind, ctinfo); + + if (!ctinfo || !name) + return E_INVALIDARG; + + info = TLB_get_typeinfo_by_name(This->typeinfos, This->TypeInfoCount, name); + if (info) + return TYPE_E_NAMECONFLICT; + + if (This->typeinfos) + This->typeinfos = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->typeinfos, + sizeof(ITypeInfoImpl*) * (This->TypeInfoCount + 1)); + else + This->typeinfos = heap_alloc_zero(sizeof(ITypeInfoImpl*)); + + info = This->typeinfos[This->TypeInfoCount] = ITypeInfoImpl_Constructor(); + + info->pTypeLib = This; + info->Name = SysAllocString(name); + info->index = This->TypeInfoCount; + info->TypeAttr.typekind = kind; + info->TypeAttr.cbAlignment = 4; + + switch(info->TypeAttr.typekind) { + case TKIND_ENUM: + case TKIND_INTERFACE: + case TKIND_DISPATCH: + case TKIND_COCLASS: + info->TypeAttr.cbSizeInstance = 4; + break; + case TKIND_RECORD: + case TKIND_UNION: + info->TypeAttr.cbSizeInstance = 0; + break; + case TKIND_MODULE: + info->TypeAttr.cbSizeInstance = 2; + break; + case TKIND_ALIAS: + info->TypeAttr.cbSizeInstance = -0x75; + break; + default: + FIXME("unrecognized typekind %d\n", info->TypeAttr.typekind); + info->TypeAttr.cbSizeInstance = 0xdeadbeef; + break; + } + + hres = ITypeInfo2_QueryInterface(&info->ITypeInfo2_iface, + &IID_ICreateTypeInfo, (void **)ctinfo); + if (FAILED(hres)) { + SysFreeString(info->Name); + ITypeInfo2_Release(&info->ITypeInfo2_iface); + return hres; + } + + info->hreftype = info->index * sizeof(MSFT_TypeInfoBase); + + ++This->TypeInfoCount; + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetName(ICreateTypeLib2 *iface,

1 0

Andrew Eikum : oleaut32: Implement basic ICreateTypeInfo functions.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 6f6a487579efbce6cbdbe784efd91a4268225baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f6a487579efbce6cbdbe784e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 24 11:28:39 2013 -0500 oleaut32: Implement basic ICreateTypeInfo functions. --- dlls/oleaut32/typelib.c | 102 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 81 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9bbd86f..83b503c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -8307,40 +8307,68 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetGuid(ICreateTypeInfo2 *iface, REFGUID guid) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %s - stub\n", This, debugstr_guid(guid)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, debugstr_guid(guid)); + + memcpy(&This->TypeAttr.guid, guid, sizeof(GUID)); + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface, UINT typeFlags) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %x - stub\n", This, typeFlags); - return E_NOTIMPL; + + TRACE("%p %x\n", This, typeFlags); + + if (typeFlags & TYPEFLAG_FDUAL) + typeFlags |= TYPEFLAG_FDISPATCHABLE; + + This->TypeAttr.wTypeFlags = typeFlags; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetDocString(ICreateTypeInfo2 *iface, - LPOLESTR strDoc) + LPOLESTR doc) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %s - stub\n", This, wine_dbgstr_w(strDoc)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, wine_dbgstr_w(doc)); + + if (!doc) + return E_INVALIDARG; + + SysFreeString(This->DocString); + This->DocString = SysAllocString(doc); + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpContext(ICreateTypeInfo2 *iface, DWORD helpContext) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %d - stub\n", This, helpContext); - return E_NOTIMPL; + + TRACE("%p %d\n", This, helpContext); + + This->dwHelpContext = helpContext; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetVersion(ICreateTypeInfo2 *iface, WORD majorVerNum, WORD minorVerNum) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %d %d - stub\n", This, majorVerNum, minorVerNum); - return E_NOTIMPL; + + TRACE("%p %d %d\n", This, majorVerNum, minorVerNum); + + This->TypeAttr.wMajorVerNum = majorVerNum; + This->TypeAttr.wMinorVerNum = minorVerNum; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo(ICreateTypeInfo2 *iface, @@ -8379,16 +8407,28 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetAlignment(ICreateTypeInfo2 *iface, WORD alignment) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %d - stub\n", This, alignment); - return E_NOTIMPL; + + TRACE("%p %d\n", This, alignment); + + This->TypeAttr.cbAlignment = alignment; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetSchema(ICreateTypeInfo2 *iface, LPOLESTR schema) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %s - stub\n", This, wine_dbgstr_w(schema)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, wine_dbgstr_w(schema)); + + if (!schema) + return E_INVALIDARG; + + SysFreeString(This->TypeAttr.lpstrSchema); + This->TypeAttr.lpstrSchema = SysAllocString(schema); + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc(ICreateTypeInfo2 *iface, @@ -8475,8 +8515,16 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeIdldesc(ICreateTypeInfo2 *iface, IDLDESC *idlDesc) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %p - stub\n", This, idlDesc); - return E_NOTIMPL; + + TRACE("%p %p\n", This, idlDesc); + + if (!idlDesc) + return E_INVALIDARG; + + This->TypeAttr.idldescType.dwReserved = idlDesc->dwReserved; + This->TypeAttr.idldescType.wIDLFlags = idlDesc->wIDLFlags; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) @@ -8570,8 +8618,12 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpStringContext(ICreateTypeInfo2 * ULONG helpStringContext) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u - stub\n", This, helpStringContext); - return E_NOTIMPL; + + TRACE("%p %u\n", This, helpStringContext); + + This->dwHelpStringContext = helpStringContext; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpStringContext(ICreateTypeInfo2 *iface, @@ -8601,8 +8653,16 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetName(ICreateTypeInfo2 *iface, LPOLESTR name) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %s - stub\n", This, wine_dbgstr_w(name)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, wine_dbgstr_w(name)); + + if (!name) + return E_INVALIDARG; + + SysFreeString(This->Name); + This->Name = SysAllocString(name); + + return S_OK; } static const ICreateTypeInfo2Vtbl CreateTypeInfo2Vtbl = {

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2013