January 2011 - Wine-commits

Andrew Nguyen : shell32: Fix initial reference count for a new IAutoComplete instance.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 7a6c0d2f466793852d273890c67bc4e1c00cebb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a6c0d2f466793852d273890c… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jan 21 04:56:22 2011 -0600 shell32: Fix initial reference count for a new IAutoComplete instance. --- dlls/shell32/autocomplete.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index f50c2b7..d1139e2 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -121,33 +121,27 @@ static void create_listbox(IAutoCompleteImpl *This) HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) { IAutoCompleteImpl *lpac; + HRESULT hr; if (pUnkOuter && !IsEqualIID (riid, &IID_IUnknown)) - return CLASS_E_NOAGGREGATION; + return CLASS_E_NOAGGREGATION; lpac = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAutoCompleteImpl)); - if (!lpac) - return E_OUTOFMEMORY; + if (!lpac) + return E_OUTOFMEMORY; lpac->ref = 1; lpac->lpVtbl = &acvt; lpac->lpDropDownVtbl = &acdropdownvt; lpac->enabled = TRUE; - lpac->enumstr = NULL; lpac->options = ACO_AUTOAPPEND; - lpac->wpOrigEditProc = NULL; - lpac->hwndListBox = NULL; - lpac->txtbackup = NULL; - lpac->quickComplete = NULL; - - if (FAILED (IUnknown_QueryInterface (_IUnknown_ (lpac), riid, ppv))) { - IUnknown_Release (_IUnknown_ (lpac)); - return E_NOINTERFACE; - } - + + hr = IUnknown_QueryInterface(_IUnknown_ (lpac), riid, ppv); + IUnknown_Release(_IUnknown_ (lpac)); + TRACE("-- (%p)->\n",lpac); - return S_OK; + return hr; } /**************************************************************************

1 0

Andrew Nguyen : include: Add an extern C++ block around the property key equality operators.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 2d12be7df9dd695794a71b246336b299207f8fcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d12be7df9dd695794a71b246… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jan 21 04:58:23 2011 -0600 include: Add an extern C++ block around the property key equality operators. --- include/propkeydef.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/propkeydef.h b/include/propkeydef.h index 2a796ea..ab8a7e6 100644 --- a/include/propkeydef.h +++ b/include/propkeydef.h @@ -58,6 +58,9 @@ #ifndef _PROPERTYKEY_EQUALITY_OPERATORS_ #define _PROPERTYKEY_EQUALITY_OPERATORS_ #ifdef __cplusplus +extern "C++" +{ + inline bool operator==(REFPROPERTYKEY guidOne, REFPROPERTYKEY guidOther) { return IsEqualPropertyKey(guidOne, guidOther); @@ -66,5 +69,7 @@ inline bool operator!=(REFPROPERTYKEY guidOne, REFPROPERTYKEY guidOther) { return !(guidOne == guidOther); } + +} #endif #endif

1 0

Andrew Nguyen : regedit: Remove an unused string array.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 6c8f8a64b008c4126845085fd6d3fd895eb9ce88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c8f8a64b008c4126845085fd… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jan 21 04:58:31 2011 -0600 regedit: Remove an unused string array. Spotted by Austin English with LLVM/Clang. --- programs/regedit/regproc.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index edf3d00..ff97970 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -37,20 +37,15 @@ */ #define REG_FILE_HEX_LINE_LEN (2 + 25 * 3) -static const CHAR *reg_class_names[] = { - "HKEY_LOCAL_MACHINE", "HKEY_USERS", "HKEY_CLASSES_ROOT", - "HKEY_CURRENT_CONFIG", "HKEY_CURRENT_USER", "HKEY_DYN_DATA" - }; - -#define REG_CLASS_NUMBER (sizeof(reg_class_names) / sizeof(reg_class_names[0])) - extern const WCHAR* reg_class_namesW[]; -static HKEY reg_class_keys[REG_CLASS_NUMBER] = { +static HKEY reg_class_keys[] = { HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_CONFIG, HKEY_CURRENT_USER, HKEY_DYN_DATA }; +#define REG_CLASS_NUMBER (sizeof(reg_class_keys) / sizeof(reg_class_keys[0])) + /* return values */ #define NOT_ENOUGH_MEMORY 1 #define IO_ERROR 2

1 0

Andrew Nguyen : kernel32/tests: Free environment strings buffer at the conclusion of the environment tests .
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 70d67becac62de216202ac9fa08c25c446291989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70d67becac62de216202ac9fa… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jan 21 05:02:57 2011 -0600 kernel32/tests: Free environment strings buffer at the conclusion of the environment tests. --- dlls/kernel32/tests/process.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index a0ad79e..bafd8a0 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1102,10 +1102,11 @@ static void test_Environment(void) char buffer[MAX_PATH]; PROCESS_INFORMATION info; STARTUPINFOA startup; - char* child_env; + char *child_env; int child_env_len; - char* ptr; - char* env; + char *ptr; + char *ptr2; + char *env; int slen; memset(&startup, 0, sizeof(startup)); @@ -1121,8 +1122,9 @@ static void test_Environment(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); - - cmpEnvironment(GetEnvironmentStringsA()); + + env = GetEnvironmentStringsA(); + cmpEnvironment(env); release_memory(); assert(DeleteFileA(resfile) != 0); @@ -1134,9 +1136,9 @@ static void test_Environment(void) /* the basics */ get_file_name(resfile); sprintf(buffer, "\"%s\" tests/process.c \"%s\"", selfname, resfile); - + child_env_len = 0; - ptr = GetEnvironmentStringsA(); + ptr = env; while(*ptr) { slen = strlen(ptr)+1; @@ -1146,7 +1148,7 @@ static void test_Environment(void) /* Add space for additional environment variables */ child_env_len += 256; child_env = HeapAlloc(GetProcessHeap(), 0, child_env_len); - + ptr = child_env; sprintf(ptr, "=%c:=%s", 'C', "C:\\FOO\\BAR"); ptr += strlen(ptr) + 1; @@ -1161,13 +1163,13 @@ static void test_Environment(void) * - PATH (already set above) * - the directory definitions (=[A-Z]:=) */ - for (env = GetEnvironmentStringsA(); *env; env += strlen(env) + 1) + for (ptr2 = env; *ptr2; ptr2 += strlen(ptr2) + 1) { - if (strncmp(env, "PATH=", 5) != 0 && - strncmp(env, "WINELOADER=", 11) != 0 && - !is_str_env_drive_dir(env)) + if (strncmp(ptr2, "PATH=", 5) != 0 && + strncmp(ptr2, "WINELOADER=", 11) != 0 && + !is_str_env_drive_dir(ptr2)) { - strcpy(ptr, env); + strcpy(ptr, ptr2); ptr += strlen(ptr) + 1; } } @@ -1177,10 +1179,11 @@ static void test_Environment(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); - + cmpEnvironment(child_env); HeapFree(GetProcessHeap(), 0, child_env); + FreeEnvironmentStringsA(env); release_memory(); assert(DeleteFileA(resfile) != 0); }

1 0

Andrew Nguyen : windowscodecs: Avoid writing to the output pointer on failure in StreamOnStreamRange:: Read and StreamOnStreamRange::Write.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: a0bc2bd91e53aea4a8c9a842eef8736d53571356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0bc2bd91e53aea4a8c9a842e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jan 21 05:03:07 2011 -0600 windowscodecs: Avoid writing to the output pointer on failure in StreamOnStreamRange::Read and StreamOnStreamRange::Write. --- dlls/windowscodecs/stream.c | 4 +- dlls/windowscodecs/tests/stream.c | 63 ++++++++++++++++++++++++++++++------ 2 files changed, 54 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0bc2bd91e53aea4a8c9a…

1 0

Ken Thomases : windowscodecs: Disable ICNS support when building for Mac OS X 10.4 Tiger.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 677c1e578d45aafc6886691eebce7ea33ead44c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=677c1e578d45aafc6886691ee… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 20 18:58:57 2011 -0600 windowscodecs: Disable ICNS support when building for Mac OS X 10.4 Tiger. --- dlls/windowscodecs/icnsformat.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index fa5a71d..de38715 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -68,7 +68,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); -#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H +#if defined(HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H) && \ + MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4 typedef struct IcnsEncoder { IWICBitmapEncoder IWICBitmapEncoder_iface; @@ -752,7 +753,8 @@ HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) return ret; } -#else /* !defined(HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H) */ +#else /* !defined(HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H) || + MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 */ HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) {

1 0

Ken Thomases : secur32/tests: Fix copy/paste error in test message ("first" -> "third").
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: cf2de431acb530c6c42820f9364e698df2f5bc27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2de431acb530c6c42820f93… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 20 20:08:42 2011 -0600 secur32/tests: Fix copy/paste error in test message ("first" -> "third"). --- dlls/secur32/tests/schannel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 18a5c1e..7eac489 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -747,7 +747,7 @@ static void test_communication(void) ok(status == SEC_E_OK, "DecryptMessage failed: %08x\n", status); ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_STREAM_HEADER, "Expected first buffer to be SECBUFFER_STREAM_HEADER\n"); ok(buffers[0].pBuffers[1].BufferType == SECBUFFER_DATA, "Expected second buffer to be SECBUFFER_DATA\n"); - ok(buffers[0].pBuffers[2].BufferType == SECBUFFER_STREAM_TRAILER, "Expected first buffer to be SECBUFFER_STREAM_TRAILER\n"); + ok(buffers[0].pBuffers[2].BufferType == SECBUFFER_STREAM_TRAILER, "Expected third buffer to be SECBUFFER_STREAM_TRAILER\n"); data = buffers[0].pBuffers[1].pvBuffer; data[buffers[0].pBuffers[1].cbBuffer] = 0;

1 0

Michael Stefaniuc : ddraw: Drop "Thunk_" from the names of the IDirect3DMaterial* methods.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: da0186798df3aa054545afb8e42269f7fac452c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0186798df3aa054545afb8e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 21 10:40:03 2011 +0100 ddraw: Drop "Thunk_" from the names of the IDirect3DMaterial* methods. --- dlls/ddraw/material.c | 72 ++++++++++++++++++++---------------------------- 1 files changed, 30 insertions(+), 42 deletions(-) diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 42d5edc..e137bfc 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -326,7 +326,7 @@ IDirect3DMaterialImpl_GetHandle(IDirect3DMaterial3 *iface, return D3D_OK; } -static HRESULT WINAPI Thunk_IDirect3DMaterialImpl_2_GetHandle(IDirect3DMaterial2 *iface, +static HRESULT WINAPI IDirect3DMaterialImpl_2_GetHandle(IDirect3DMaterial2 *iface, IDirect3DDevice2 *lpDirect3DDevice2, D3DMATERIALHANDLE *lpHandle) { TRACE("iface %p, device %p, handle %p.\n", iface, lpDirect3DDevice2, lpHandle); @@ -335,7 +335,7 @@ static HRESULT WINAPI Thunk_IDirect3DMaterialImpl_2_GetHandle(IDirect3DMaterial2 (IDirect3DDevice3 *)&device_from_device2(lpDirect3DDevice2)->IDirect3DDevice3_vtbl : NULL, lpHandle); } -static HRESULT WINAPI Thunk_IDirect3DMaterialImpl_1_GetHandle(IDirect3DMaterial *iface, +static HRESULT WINAPI IDirect3DMaterialImpl_1_GetHandle(IDirect3DMaterial *iface, IDirect3DDevice *lpDirect3DDevice, D3DMATERIALHANDLE *lpHandle) { TRACE("iface %p, device %p, handle %p.\n", iface, lpDirect3DDevice, lpHandle); @@ -344,88 +344,76 @@ static HRESULT WINAPI Thunk_IDirect3DMaterialImpl_1_GetHandle(IDirect3DMaterial (IDirect3DDevice3 *)&device_from_device1(lpDirect3DDevice)->IDirect3DDevice3_vtbl : NULL, lpHandle); } -static HRESULT WINAPI -Thunk_IDirect3DMaterialImpl_2_QueryInterface(LPDIRECT3DMATERIAL2 iface, - REFIID riid, - LPVOID* obp) +static HRESULT WINAPI IDirect3DMaterialImpl_2_QueryInterface(LPDIRECT3DMATERIAL2 iface, REFIID riid, + LPVOID* obp) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obp); return IDirect3DMaterial3_QueryInterface((IDirect3DMaterial3 *)material_from_material2(iface), riid, obp); } -static HRESULT WINAPI -Thunk_IDirect3DMaterialImpl_1_QueryInterface(LPDIRECT3DMATERIAL iface, - REFIID riid, - LPVOID* obp) +static HRESULT WINAPI IDirect3DMaterialImpl_1_QueryInterface(LPDIRECT3DMATERIAL iface, REFIID riid, + LPVOID* obp) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obp); return IDirect3DMaterial3_QueryInterface((IDirect3DMaterial3 *)material_from_material1(iface), riid, obp); } -static ULONG WINAPI -Thunk_IDirect3DMaterialImpl_2_AddRef(LPDIRECT3DMATERIAL2 iface) +static ULONG WINAPI IDirect3DMaterialImpl_2_AddRef(LPDIRECT3DMATERIAL2 iface) { TRACE("iface %p.\n", iface); return IDirect3DMaterial3_AddRef((IDirect3DMaterial3 *)material_from_material2(iface)); } -static ULONG WINAPI -Thunk_IDirect3DMaterialImpl_1_AddRef(LPDIRECT3DMATERIAL iface) +static ULONG WINAPI IDirect3DMaterialImpl_1_AddRef(LPDIRECT3DMATERIAL iface) { TRACE("iface %p.\n", iface); return IDirect3DMaterial3_AddRef((IDirect3DMaterial3 *)material_from_material1(iface)); } -static ULONG WINAPI -Thunk_IDirect3DMaterialImpl_2_Release(LPDIRECT3DMATERIAL2 iface) +static ULONG WINAPI IDirect3DMaterialImpl_2_Release(LPDIRECT3DMATERIAL2 iface) { TRACE("iface %p.\n", iface); return IDirect3DMaterial3_Release((IDirect3DMaterial3 *)material_from_material2(iface)); } -static ULONG WINAPI -Thunk_IDirect3DMaterialImpl_1_Release(LPDIRECT3DMATERIAL iface) +static ULONG WINAPI IDirect3DMaterialImpl_1_Release(LPDIRECT3DMATERIAL iface) { TRACE("iface %p.\n", iface); return IDirect3DMaterial3_Release((IDirect3DMaterial3 *)material_from_material1(iface)); } -static HRESULT WINAPI -Thunk_IDirect3DMaterialImpl_2_SetMaterial(LPDIRECT3DMATERIAL2 iface, - LPD3DMATERIAL lpMat) +static HRESULT WINAPI IDirect3DMaterialImpl_2_SetMaterial(LPDIRECT3DMATERIAL2 iface, + LPD3DMATERIAL lpMat) { TRACE("iface %p, material %p.\n", iface, lpMat); return IDirect3DMaterial3_SetMaterial((IDirect3DMaterial3 *)material_from_material2(iface), lpMat); } -static HRESULT WINAPI -Thunk_IDirect3DMaterialImpl_1_SetMaterial(LPDIRECT3DMATERIAL iface, - LPD3DMATERIAL lpMat) +static HRESULT WINAPI IDirect3DMaterialImpl_1_SetMaterial(LPDIRECT3DMATERIAL iface, + LPD3DMATERIAL lpMat) { TRACE("iface %p, material %p.\n", iface, lpMat); return IDirect3DMaterial3_SetMaterial((IDirect3DMaterial3 *)material_from_material1(iface), lpMat); } -static HRESULT WINAPI -Thunk_IDirect3DMaterialImpl_2_GetMaterial(LPDIRECT3DMATERIAL2 iface, - LPD3DMATERIAL lpMat) +static HRESULT WINAPI IDirect3DMaterialImpl_2_GetMaterial(LPDIRECT3DMATERIAL2 iface, + LPD3DMATERIAL lpMat) { TRACE("iface %p, material %p.\n", iface, lpMat); return IDirect3DMaterial3_GetMaterial((IDirect3DMaterial3 *)material_from_material2(iface), lpMat); } -static HRESULT WINAPI -Thunk_IDirect3DMaterialImpl_1_GetMaterial(LPDIRECT3DMATERIAL iface, - LPD3DMATERIAL lpMat) +static HRESULT WINAPI IDirect3DMaterialImpl_1_GetMaterial(LPDIRECT3DMATERIAL iface, + LPD3DMATERIAL lpMat) { TRACE("iface %p, material %p.\n", iface, lpMat); @@ -471,26 +459,26 @@ static const struct IDirect3DMaterial3Vtbl d3d_material3_vtbl = static const struct IDirect3DMaterial2Vtbl d3d_material2_vtbl = { /*** IUnknown Methods ***/ - Thunk_IDirect3DMaterialImpl_2_QueryInterface, - Thunk_IDirect3DMaterialImpl_2_AddRef, - Thunk_IDirect3DMaterialImpl_2_Release, + IDirect3DMaterialImpl_2_QueryInterface, + IDirect3DMaterialImpl_2_AddRef, + IDirect3DMaterialImpl_2_Release, /*** IDirect3DMaterial2 Methods ***/ - Thunk_IDirect3DMaterialImpl_2_SetMaterial, - Thunk_IDirect3DMaterialImpl_2_GetMaterial, - Thunk_IDirect3DMaterialImpl_2_GetHandle, + IDirect3DMaterialImpl_2_SetMaterial, + IDirect3DMaterialImpl_2_GetMaterial, + IDirect3DMaterialImpl_2_GetHandle, }; static const struct IDirect3DMaterialVtbl d3d_material1_vtbl = { /*** IUnknown Methods ***/ - Thunk_IDirect3DMaterialImpl_1_QueryInterface, - Thunk_IDirect3DMaterialImpl_1_AddRef, - Thunk_IDirect3DMaterialImpl_1_Release, + IDirect3DMaterialImpl_1_QueryInterface, + IDirect3DMaterialImpl_1_AddRef, + IDirect3DMaterialImpl_1_Release, /*** IDirect3DMaterial1 Methods ***/ IDirect3DMaterialImpl_Initialize, - Thunk_IDirect3DMaterialImpl_1_SetMaterial, - Thunk_IDirect3DMaterialImpl_1_GetMaterial, - Thunk_IDirect3DMaterialImpl_1_GetHandle, + IDirect3DMaterialImpl_1_SetMaterial, + IDirect3DMaterialImpl_1_GetMaterial, + IDirect3DMaterialImpl_1_GetHandle, IDirect3DMaterialImpl_Reserve, IDirect3DMaterialImpl_Unreserve };

1 0

Michael Stefaniuc : ddraw: Drop "Thunk_" from the names of the IDirect3DVertexBuffer methods.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 15dfe304bf528933f07c785599a7133fffd70662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15dfe304bf528933f07c78559… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 21 10:40:26 2011 +0100 ddraw: Drop "Thunk_" from the names of the IDirect3DVertexBuffer methods. --- dlls/ddraw/vertexbuffer.c | 61 ++++++++++++++++---------------------------- 1 files changed, 22 insertions(+), 39 deletions(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index a001b03..dc12dc2 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -82,10 +82,8 @@ IDirect3DVertexBufferImpl_QueryInterface(IDirect3DVertexBuffer7 *iface, return E_NOINTERFACE; } -static HRESULT WINAPI -Thunk_IDirect3DVertexBufferImpl_1_QueryInterface(IDirect3DVertexBuffer *iface, - REFIID riid, - void **obj) +static HRESULT WINAPI IDirect3DVertexBufferImpl_1_QueryInterface(IDirect3DVertexBuffer *iface, + REFIID riid, void **obj) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj); @@ -112,8 +110,7 @@ IDirect3DVertexBufferImpl_AddRef(IDirect3DVertexBuffer7 *iface) return ref; } -static ULONG WINAPI -Thunk_IDirect3DVertexBufferImpl_1_AddRef(IDirect3DVertexBuffer *iface) +static ULONG WINAPI IDirect3DVertexBufferImpl_1_AddRef(IDirect3DVertexBuffer *iface) { TRACE("iface %p.\n", iface); @@ -176,8 +173,7 @@ IDirect3DVertexBufferImpl_Release(IDirect3DVertexBuffer7 *iface) return ref; } -static ULONG WINAPI -Thunk_IDirect3DVertexBufferImpl_1_Release(IDirect3DVertexBuffer *iface) +static ULONG WINAPI IDirect3DVertexBufferImpl_1_Release(IDirect3DVertexBuffer *iface) { TRACE("iface %p.\n", iface); @@ -242,11 +238,8 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface, return hr; } -static HRESULT WINAPI -Thunk_IDirect3DVertexBufferImpl_1_Lock(IDirect3DVertexBuffer *iface, - DWORD Flags, - void **Data, - DWORD *Size) +static HRESULT WINAPI IDirect3DVertexBufferImpl_1_Lock(IDirect3DVertexBuffer *iface, DWORD Flags, + void **Data, DWORD *Size) { TRACE("iface %p, flags %#x, data %p, data_size %p.\n", iface, Flags, Data, Size); @@ -276,8 +269,7 @@ IDirect3DVertexBufferImpl_Unlock(IDirect3DVertexBuffer7 *iface) return D3D_OK; } -static HRESULT WINAPI -Thunk_IDirect3DVertexBufferImpl_1_Unlock(IDirect3DVertexBuffer *iface) +static HRESULT WINAPI IDirect3DVertexBufferImpl_1_Unlock(IDirect3DVertexBuffer *iface) { TRACE("iface %p.\n", iface); @@ -379,15 +371,9 @@ IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexBuffer7 *iface, return hr; } -static HRESULT WINAPI -Thunk_IDirect3DVertexBufferImpl_1_ProcessVertices(IDirect3DVertexBuffer *iface, - DWORD VertexOp, - DWORD DestIndex, - DWORD Count, - IDirect3DVertexBuffer *SrcBuffer, - DWORD SrcIndex, - IDirect3DDevice3 *D3DDevice, - DWORD Flags) +static HRESULT WINAPI IDirect3DVertexBufferImpl_1_ProcessVertices(IDirect3DVertexBuffer *iface, + DWORD VertexOp, DWORD DestIndex, DWORD Count, IDirect3DVertexBuffer *SrcBuffer, + DWORD SrcIndex, IDirect3DDevice3 *D3DDevice, DWORD Flags) { IDirect3DVertexBufferImpl *Src = SrcBuffer ? vb_from_vb1(SrcBuffer) : NULL; IDirect3DDeviceImpl *D3D = D3DDevice ? device_from_device3(D3DDevice) : NULL; @@ -435,9 +421,8 @@ IDirect3DVertexBufferImpl_GetVertexBufferDesc(IDirect3DVertexBuffer7 *iface, return D3D_OK; } -static HRESULT WINAPI -Thunk_IDirect3DVertexBufferImpl_1_GetVertexBufferDesc(IDirect3DVertexBuffer *iface, - D3DVERTEXBUFFERDESC *Desc) +static HRESULT WINAPI IDirect3DVertexBufferImpl_1_GetVertexBufferDesc(IDirect3DVertexBuffer *iface, + D3DVERTEXBUFFERDESC *Desc) { TRACE("iface %p, desc %p.\n", iface, Desc); @@ -484,10 +469,8 @@ IDirect3DVertexBufferImpl_Optimize(IDirect3DVertexBuffer7 *iface, return DD_OK; } -static HRESULT WINAPI -Thunk_IDirect3DVertexBufferImpl_1_Optimize(IDirect3DVertexBuffer *iface, - IDirect3DDevice3 *D3DDevice, - DWORD Flags) +static HRESULT WINAPI IDirect3DVertexBufferImpl_1_Optimize(IDirect3DVertexBuffer *iface, + IDirect3DDevice3 *D3DDevice, DWORD Flags) { IDirect3DDeviceImpl *D3D = D3DDevice ? device_from_device3(D3DDevice) : NULL; @@ -558,15 +541,15 @@ static const struct IDirect3DVertexBuffer7Vtbl d3d_vertex_buffer7_vtbl = static const struct IDirect3DVertexBufferVtbl d3d_vertex_buffer1_vtbl = { /*** IUnknown Methods ***/ - Thunk_IDirect3DVertexBufferImpl_1_QueryInterface, - Thunk_IDirect3DVertexBufferImpl_1_AddRef, - Thunk_IDirect3DVertexBufferImpl_1_Release, + IDirect3DVertexBufferImpl_1_QueryInterface, + IDirect3DVertexBufferImpl_1_AddRef, + IDirect3DVertexBufferImpl_1_Release, /*** IDirect3DVertexBuffer Methods ***/ - Thunk_IDirect3DVertexBufferImpl_1_Lock, - Thunk_IDirect3DVertexBufferImpl_1_Unlock, - Thunk_IDirect3DVertexBufferImpl_1_ProcessVertices, - Thunk_IDirect3DVertexBufferImpl_1_GetVertexBufferDesc, - Thunk_IDirect3DVertexBufferImpl_1_Optimize + IDirect3DVertexBufferImpl_1_Lock, + IDirect3DVertexBufferImpl_1_Unlock, + IDirect3DVertexBufferImpl_1_ProcessVertices, + IDirect3DVertexBufferImpl_1_GetVertexBufferDesc, + IDirect3DVertexBufferImpl_1_Optimize }; HRESULT d3d_vertex_buffer_init(IDirect3DVertexBufferImpl *buffer,

1 0

Thomas Mullaly : urlmon: Added stub for CoInternetGetSecurityUrlEx.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: f46bd50e5dfca034fa9dff4d4bc7da4dae2da8d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46bd50e5dfca034fa9dff4d4… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Jan 15 16:03:03 2011 -0500 urlmon: Added stub for CoInternetGetSecurityUrlEx. --- dlls/urlmon/sec_mgr.c | 9 +++++++++ dlls/urlmon/urlmon.spec | 1 + include/urlmon.idl | 1 + 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 6b12a9a..7e8d02b 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1326,3 +1326,12 @@ HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR pwzUrl, LPWSTR *ppwzSecUrl, PSUA memcpy(*ppwzSecUrl, url, len*sizeof(WCHAR)); return S_OK; } + +/******************************************************************** + * CoInternetGetSecurityUrlEx (URLMON.@) + */ +HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri *pUri, IUri **ppSecUri, PSUACTION psuAction, DWORD_PTR dwReserved) +{ + FIXME("(%p,%p,%u,%u)\n", pUri, ppSecUri, psuAction, (DWORD)dwReserved); + return E_NOTIMPL; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 1db915e..a2081ed 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -18,6 +18,7 @@ @ stdcall CoInternetCreateZoneManager(ptr ptr long) @ stub CoInternetGetProtocolFlags @ stdcall CoInternetGetSecurityUrl(ptr ptr long long) +@ stdcall CoInternetGetSecurityUrlEx(ptr ptr long long) @ stdcall CoInternetGetSession(long ptr long) @ stdcall CoInternetIsFeatureEnabled(long long) @ stdcall CoInternetParseUrl(wstr long long wstr long ptr long) diff --git a/include/urlmon.idl b/include/urlmon.idl index 240b6a7..cdcb4c8 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1964,6 +1964,7 @@ cpp_quote("HRESULT WINAPI CoInternetParseIUri(IUri*,PARSEACTION,DWORD,LPWSTR,DWO cpp_quote("HRESULT WINAPI CoInternetQueryInfo(LPCWSTR,QUERYOPTION,DWORD,LPVOID,DWORD,DWORD*,DWORD);") cpp_quote("HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST,DWORD,BOOL);") cpp_quote("HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR,LPWSTR*,PSUACTION,DWORD);") +cpp_quote("HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri*,IUri**,PSUACTION,DWORD_PTR);") cpp_quote("HRESULT WINAPI CreateFormatEnumerator(UINT,FORMATETC*,IEnumFORMATETC**);") cpp_quote("HRESULT WINAPI GetSoftwareUpdateInfo( LPCWSTR szDistUnit, LPSOFTDISTINFO psdi);") cpp_quote("HRESULT WINAPI FaultInIEFeature(HWND,uCLSSPEC*,QUERYCONTEXT*,DWORD);")

1 0