May 2013 - Wine-Commits - list.winehq.org

Dan Kegel : kernel32: Make SetThreadPriorityBoost return success.
by Alexandre Julliard May 28, 2013

May 28, 2013

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

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

May 28, 2013

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 : d3drm: Avoid LPDIRECT3DRMMATERIAL.
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: 19a519e90a763b713faad84b463bdd78d03b485a URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a519e90a763b713faad84b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 28 08:55:21 2013 +0200 d3drm: Avoid LPDIRECT3DRMMATERIAL. --- dlls/d3drm/d3drm.c | 19 ++++++++++--------- dlls/d3drm/frame.c | 7 ++----- dlls/d3drm/meshbuilder.c | 46 ++++++++++++++++++++++++---------------------- dlls/d3drm/tests/d3drm.c | 2 +- include/d3drm.h | 4 ++-- include/d3drmobj.h | 16 ++++++++-------- 6 files changed, 47 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19a519e90a763b713faad…

1 0

Qian Hong : atl100: Fixed AtlAdvise and AtlUnadvise crashing with NULL pUnkCP.
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: 8d18b8934618f2d1e7d1e3a009f8f04771e03a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d18b8934618f2d1e7d1e3a00… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat May 25 20:56:43 2013 +0800 atl100: Fixed AtlAdvise and AtlUnadvise crashing with NULL pUnkCP. --- dlls/atl100/atl.c | 6 ++++++ dlls/atl100/tests/atl.c | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index a8b8208..0aae80b 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -51,6 +51,9 @@ HRESULT WINAPI AtlAdvise(IUnknown *pUnkCP, IUnknown *pUnk, const IID *iid, DWORD TRACE("%p %p %p %p\n", pUnkCP, pUnk, iid, pdw); + if(!pUnkCP) + return E_INVALIDARG; + hres = IUnknown_QueryInterface(pUnkCP, &IID_IConnectionPointContainer, (void**)&container); if(FAILED(hres)) return hres; @@ -76,6 +79,9 @@ HRESULT WINAPI AtlUnadvise(IUnknown *pUnkCP, const IID *iid, DWORD dw) TRACE("%p %p %d\n", pUnkCP, iid, dw); + if(!pUnkCP) + return E_INVALIDARG; + hres = IUnknown_QueryInterface(pUnkCP, &IID_IConnectionPointContainer, (void**)&container); if(FAILED(hres)) return hres; diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 1304ac1..4cf4a62 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -359,6 +359,12 @@ static void test_cp(void) DWORD cookie = 0; HRESULT hres; + hres = AtlAdvise(NULL, (IUnknown*)0xdeed0000, &CLSID_Test, &cookie); + ok(hres == E_INVALIDARG, "expect E_INVALIDARG, returned %08x\n", hres); + + hres = AtlUnadvise(NULL, &CLSID_Test, 0xdeadbeef); + ok(hres == E_INVALIDARG, "expect E_INVALIDARG, returned %08x\n", hres); + hres = AtlAdvise((IUnknown*)&ConnectionPointContainer, (IUnknown*)0xdead0000, &CLSID_Test, &cookie); ok(hres == S_OK, "AtlAdvise failed: %08x\n", hres); ok(cookie == 0xdeadbeef, "cookie = %x\n", cookie);

1 0

Christian Costa : d3dx9_36: Implement skin mesh loading.
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: e558925d75eac467ea793697a299fb90cd4d4c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e558925d75eac467ea793697a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed May 22 00:03:11 2013 +0200 d3dx9_36: Implement skin mesh loading. --- dlls/d3dx9_36/mesh.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 90 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 2b7579e..82b3134 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -7,6 +7,7 @@ * Copyright (C) 2010 Tony Wasserka * Copyright (C) 2011 Dylan Smith * Copyright (C) 2011 Michael Mc Donnell + * Copyright (C) 2013 Christian Costa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2632,6 +2633,9 @@ struct mesh_data { DWORD num_materials; D3DXMATERIAL *materials; DWORD *material_indices; + + struct ID3DXSkinInfo *skin_info; + DWORD nb_bones; }; static HRESULT parse_texture_filename(ID3DXFileData *filedata, LPSTR *filename_out) @@ -3099,6 +3103,64 @@ end: return hr; } +static HRESULT parse_skin_mesh_info(ID3DXFileData *filedata, struct mesh_data *mesh_data, DWORD index) +{ + HRESULT hr; + SIZE_T data_size; + const BYTE *data; + + TRACE("(%p, %p, %u)\n", filedata, mesh_data, index); + + hr = filedata->lpVtbl->Lock(filedata, &data_size, (const void**)&data); + if (FAILED(hr)) return hr; + + hr = E_FAIL; + + if (!mesh_data->skin_info) { + if (data_size < sizeof(WORD) * 3) { + WARN("truncated data (%ld bytes)\n", data_size); + goto end; + } + /* Skip nMaxSkinWeightsPerVertex and nMaxSkinWeightsPerFace */ + data += 2 * sizeof(WORD); + mesh_data->nb_bones = *(WORD*)data; + hr = D3DXCreateSkinInfoFVF(mesh_data->num_vertices, mesh_data->fvf, mesh_data->nb_bones, &mesh_data->skin_info); + if (FAILED(hr)) + goto end; + } else { + const char *name; + DWORD nb_influences; + + /* FIXME: String must be retrieved directly instead of through a pointer once ID3DXFILE is fixed */ + name = *(const char**)data; + data += sizeof(char*); + + nb_influences = *(DWORD*)data; + data += sizeof(DWORD); + + if (data_size < (sizeof(char*) + sizeof(DWORD) + nb_influences * (sizeof(DWORD) + sizeof(FLOAT)) + 16 * sizeof(FLOAT))) { + WARN("truncated data (%ld bytes)\n", data_size); + goto end; + } + + hr = mesh_data->skin_info->lpVtbl->SetBoneName(mesh_data->skin_info, index, name); + if (SUCCEEDED(hr)) + hr = mesh_data->skin_info->lpVtbl->SetBoneInfluence(mesh_data->skin_info, index, nb_influences, + (const DWORD*)data, (const FLOAT*)(data + nb_influences * sizeof(DWORD))); + if (SUCCEEDED(hr)) + hr = mesh_data->skin_info->lpVtbl->SetBoneOffsetMatrix(mesh_data->skin_info, index, + (const D3DMATRIX*)(data + nb_influences * (sizeof(DWORD) + sizeof(FLOAT)))); + if (FAILED(hr)) + goto end; + } + + hr = D3D_OK; + +end: + filedata->lpVtbl->Unlock(filedata); + return hr; +} + /* for provide_flags parameters */ #define PROVIDE_MATERIALS 0x1 #define PROVIDE_SKININFO 0x2 @@ -3114,6 +3176,7 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data, ID3DXFileData *child; DWORD i; SIZE_T nb_children; + DWORD nb_skin_weigths_info = 0; /* * template Mesh { @@ -3236,17 +3299,37 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data, hr = parse_material_list(child, mesh_data); } else if (provide_flags & PROVIDE_SKININFO) { if (IsEqualGUID(&type, &DXFILEOBJ_XSkinMeshHeader)) { - FIXME("Skin mesh loading not implemented.\n"); - hr = E_NOTIMPL; - goto end; + if (mesh_data->skin_info) { + WARN("Skin mesh header already encountered\n"); + hr = E_FAIL; + goto end; + } + hr = parse_skin_mesh_info(child, mesh_data, 0); + if (FAILED(hr)) + goto end; } else if (IsEqualGUID(&type, &DXFILEOBJ_SkinWeights)) { - /* ignored without XSkinMeshHeader */ + if (!mesh_data->skin_info) { + WARN("Skin weigths found but skin mesh header not encountered yet\n"); + hr = E_FAIL; + goto end; + } + hr = parse_skin_mesh_info(child, mesh_data, nb_skin_weigths_info); + if (FAILED(hr)) + goto end; + nb_skin_weigths_info++; } } if (FAILED(hr)) goto end; } + if (mesh_data->skin_info && (nb_skin_weigths_info != mesh_data->nb_bones)) { + WARN("Mismatch between nb skin weights info %u encountered and nb bones %u from skin mesh header\n", + nb_skin_weigths_info, mesh_data->nb_bones); + hr = E_FAIL; + goto end; + } + hr = D3D_OK; end: @@ -3571,7 +3654,7 @@ HRESULT WINAPI D3DXLoadSkinMeshFromXof(struct ID3DXFileData *filedata, DWORD opt if (num_materials_out) *num_materials_out = mesh_data.num_materials; if (materials_out) *materials_out = materials; if (effects_out) *effects_out = effects; - if (skin_info_out) *skin_info_out = NULL; + if (skin_info_out) *skin_info_out = mesh_data.skin_info; hr = D3D_OK; cleanup: @@ -3580,6 +3663,8 @@ cleanup: if (adjacency) ID3DXBuffer_Release(adjacency); if (materials) ID3DXBuffer_Release(materials); if (effects) ID3DXBuffer_Release(effects); + if (mesh_data.skin_info) mesh_data.skin_info->lpVtbl->Release(mesh_data.skin_info); + if (skin_info_out) *skin_info_out = NULL; } HeapFree(GetProcessHeap(), 0, mesh_data.vertices); HeapFree(GetProcessHeap(), 0, mesh_data.num_tri_per_face);

1 0

Christian Costa : d3dx9_36: Port mesh code to use ID3DXFile instead of IDirectXFile and enable D3DXLoadSkinMeshFromXof .
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: 31ae8b6a1252dc1553b3f4e8fd6e6d9df4395140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ae8b6a1252dc1553b3f4e8f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed May 22 00:03:01 2013 +0200 d3dx9_36: Port mesh code to use ID3DXFile instead of IDirectXFile and enable D3DXLoadSkinMeshFromXof. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 580 ++++++++++++++++++++++++++----------------- 2 files changed, 351 insertions(+), 231 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31ae8b6a1252dc1553b3f…

1 0

Daniel Jelinski : wine.inf: Add HKLM\\System\\CurrentControlSet\\Services\\Eventlog\\Application registry key .
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: 240172f108e7800548c9bc41872c240199c14a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=240172f108e7800548c9bc418… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat May 25 20:12:51 2013 +0200 wine.inf: Add HKLM\\System\\CurrentControlSet\\Services\\Eventlog\\Application registry key. --- dlls/advapi32/tests/eventlog.c | 7 ++++--- tools/wine.inf.in | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 543b41c..b028354 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -637,7 +637,6 @@ static BOOL create_new_eventlog(void) /* First create our eventlog */ lret = RegOpenKeyA(HKEY_LOCAL_MACHINE, eventlogsvc, &key); - /* FIXME: Wine stops here */ if (lret != ERROR_SUCCESS) { skip("Could not open the EventLog service registry key\n"); @@ -832,11 +831,13 @@ static void test_readwrite(void) SetLastError(0xdeadbeef); ret = GetNumberOfEventLogRecords(handle, &count); ok(ret, "Expected GetNumberOfEventLogRecords success : %d\n", GetLastError()); + todo_wine ok(count == (i + 1), "Expected %d records, got %d\n", i + 1, count); oldest = 0xdeadbeef; ret = GetOldestEventLogRecord(handle, &oldest); ok(ret, "Expected GetOldestEventLogRecord success : %d\n", GetLastError()); + todo_wine ok(oldest == 1 || (oldest > 1 && oldest != 0xdeadbeef), /* Vista SP1+, W2K8 and Win7 */ "Expected oldest to be 1 or higher, got %d\n", oldest); @@ -855,6 +856,7 @@ static void test_readwrite(void) count = 0xdeadbeef; ret = GetNumberOfEventLogRecords(handle, &count); ok(ret, "Expected success\n"); + todo_wine ok(count == i, "Expected %d records, got %d\n", i, count); CloseEventLog(handle); @@ -1083,6 +1085,7 @@ static void test_autocreation(void) lstrcatA(eventlogfile, ".evtx"); } + todo_wine ok(GetFileAttributesA(eventlogfile) != INVALID_FILE_ATTRIBUTES, "Expected an eventlog file\n"); @@ -1109,14 +1112,12 @@ static void cleanup_eventlog(void) RegDeleteValueA(key, "Sources"); RegCloseKey(key); lret = RegDeleteKeyA(HKEY_LOCAL_MACHINE, winesvc); - todo_wine ok(lret == ERROR_SUCCESS, "Could not delete the registry tree : %d\n", lret); /* A handle to the eventlog is locked by services.exe. We can only * delete the eventlog file after reboot. */ bret = MoveFileExA(eventlogfile, NULL, MOVEFILE_DELAY_UNTIL_REBOOT); - todo_wine ok(bret, "Expected MoveFileEx to succeed: %d\n", GetLastError()); } diff --git a/tools/wine.inf.in b/tools/wine.inf.in index e48d824..14fde79 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -3005,8 +3005,9 @@ HKR,Parameters,"ServiceDll",,"%11%\srvsvc.dll" [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" -HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 +HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 +HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16

1 0

Hans Leidekker : explorer: Initial implementation of desktop launchers.
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: e44f0c8f2de480679abde7883a5161ef9526ed81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44f0c8f2de480679abde7883… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 28 12:42:09 2013 +0200 explorer: Initial implementation of desktop launchers. --- programs/explorer/desktop.c | 312 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 311 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e44f0c8f2de480679abde…

1 0

Andrew Eikum : oleaut32: Implement basic ICreateTypeInfo functions.
by Alexandre Julliard May 28, 2013

May 28, 2013

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

Andrew Eikum : oleaut32: Stub typelib and typeinfo creation interfaces in typelib.c.
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: 97a96094bb734b3794549758f2f08c0f0c7702ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=97a96094bb734b3794549758f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 24 11:28:30 2013 -0500 oleaut32: Stub typelib and typeinfo creation interfaces in typelib.c. --- dlls/oleaut32/typelib.c | 547 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 547 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97a96094bb734b3794549…

1 0