wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

André Hentschel : winex11: Fix Ctrl+Shift+Tab translation.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: ef016c32c16af11e54c55d294849b6c9127eb3a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef016c32c16af11e54c55d294… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 1 20:10:21 2009 +0200 winex11: Fix Ctrl+Shift+Tab translation. --- dlls/user32/tests/input.c | 2 ++ dlls/winex11.drv/keyboard.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 00d344b..d100610 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1285,6 +1285,8 @@ static void test_ToUnicode(void) state[VK_SHIFT] |= HIGHEST_BIT; state[VK_LSHIFT] |= HIGHEST_BIT; + ret = ToUnicode(VK_TAB, SC_TAB, state, wStr, 2, 0); + ok(ret == 0, "ToUnicode for CTRL + SHIFT + Tab didn't return 0 (was %i)\n", ret); ret = ToUnicode(VK_RETURN, SC_RETURN, state, wStr, 2, 0); todo_wine ok(ret == 0, "ToUnicode for CTRL + SHIFT + Return didn't return 0 (was %i)\n", ret); } diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index ad41c84..05b3b53 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2618,7 +2618,7 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState #endif /* Special case: X turns shift-tab into ISO_Left_Tab. */ /* Here we change it back. */ - if (keysym == XK_ISO_Left_Tab) + if (keysym == XK_ISO_Left_Tab && !(e.state & ControlMask)) { bufW[0] = 0x09; ret = 1;

1 0

Vitaly Perov : mpr: Don't set LastError if no error occured.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: d7098d0f4fa829ab14fda359284aaecab506533a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7098d0f4fa829ab14fda3592… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Mon Jun 1 20:57:16 2009 +0400 mpr: Don't set LastError if no error occured. --- dlls/mpr/wnet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 241ea2f..cffa340 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1949,7 +1949,7 @@ DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel, break; } - SetLastError(err); + if (err != WN_NO_ERROR) SetLastError(err); return err; }

1 0

Huw Davies : ole32: In simple mode keep the stream size above the small block limit.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 16dc0378594804ffa926b13cf0df6eeed133eeaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=16dc0378594804ffa926b13cf… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 1 11:36:19 2009 +0100 ole32: In simple mode keep the stream size above the small block limit. --- dlls/ole32/stg_stream.c | 4 ++++ dlls/ole32/tests/storage32.c | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 3fde160..9acd414 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -575,6 +575,10 @@ static HRESULT WINAPI StgStreamImpl_SetSize( return STG_E_ACCESSDENIED; } + /* In simple mode keep the stream size above the small block limit */ + if (This->parentStorage->ancestorStorage->base.openFlags & STGM_SIMPLE) + libNewSize.u.LowPart = max(libNewSize.u.LowPart, LIMIT_TO_USE_SMALL_BLOCK); + if (This->streamSize.u.LowPart == libNewSize.u.LowPart) return S_OK; diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index fa5d46c..438913c 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1354,6 +1354,7 @@ static void test_simple(void) HRESULT r; IStream *stm; static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + static const WCHAR stmname2[] = { 'S','m','a','l','l',0 }; LARGE_INTEGER pos; ULARGE_INTEGER upos; DWORD count; @@ -1400,6 +1401,19 @@ static void test_simple(void) IStream_Release(stm); + r = IStorage_CreateStream(stg, stmname2, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); + ok(r == S_OK, "got %08x\n", r); + + upos.QuadPart = 100; + r = IStream_SetSize(stm, upos); + ok(r == S_OK, "got %08x\n", r); + + r = IStream_Write(stm, "foo", 3, &count); + ok(r == S_OK, "got %08x\n", r); + ok(count == 3, "got %d\n", count); + + IStream_Release(stm); + IStorage_Commit(stg, STGC_DEFAULT); IStorage_Release(stg); @@ -1415,6 +1429,16 @@ static void test_simple(void) IStream_Release(stm); + r = IStorage_OpenStream(stg, stmname2, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stm); + ok(r == S_OK, "got %08x\n", r); + + r = IStream_Stat(stm, &stat, STATFLAG_NONAME); + ok(r == S_OK, "got %08x\n", r); + ok(stat.cbSize.QuadPart == 4096, "got %d\n", stat.cbSize.u.LowPart); + + IStream_Release(stm); + + IStorage_Release(stg); DeleteFileW(filename);

1 0

Huw Davies : ole32: In simple create mode the size returned by IStream_Stat is actually the current stream position .
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 02fc79b2c920412579e55e4c3d390ca487ee1e49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02fc79b2c920412579e55e4c3… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 1 11:26:12 2009 +0100 ole32: In simple create mode the size returned by IStream_Stat is actually the current stream position. --- dlls/ole32/stg_stream.c | 6 +++++ dlls/ole32/tests/storage32.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index d0e0613..3fde160 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -841,12 +841,18 @@ static HRESULT WINAPI StgStreamImpl_Stat( if (readSuccessful) { + StorageImpl *root = This->parentStorage->ancestorStorage; + StorageUtl_CopyPropertyToSTATSTG(pstatstg, &curProperty, grfStatFlag); pstatstg->grfMode = This->grfMode; + /* In simple create mode cbSize is the current pos */ + if((root->base.openFlags & STGM_SIMPLE) && root->create) + pstatstg->cbSize = This->currentPosition; + return S_OK; } diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index b426d94..fa5d46c 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1354,6 +1354,10 @@ static void test_simple(void) HRESULT r; IStream *stm; static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + LARGE_INTEGER pos; + ULARGE_INTEGER upos; + DWORD count; + STATSTG stat; if(!GetTempFileNameW(szDot, szPrefix, 0, filename)) return; @@ -1368,11 +1372,51 @@ static void test_simple(void) r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); ok(r == S_OK, "got %08x\n", r); + upos.QuadPart = 6000; + r = IStream_SetSize(stm, upos); + ok(r == S_OK, "got %08x\n", r); + + r = IStream_Write(stm, "foo", 3, &count); + ok(r == S_OK, "got %08x\n", r); + ok(count == 3, "got %d\n", count); + + pos.QuadPart = 0; + r = IStream_Seek(stm, pos, STREAM_SEEK_CUR, &upos); + ok(r == S_OK, "got %08x\n", r); + ok(upos.QuadPart == 3, "got %d\n", upos.u.LowPart); + + r = IStream_Stat(stm, &stat, STATFLAG_NONAME); + ok(r == S_OK, "got %08x\n", r); + ok(stat.cbSize.QuadPart == 3, "got %d\n", stat.cbSize.u.LowPart); + + pos.QuadPart = 1; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &upos); + ok(r == S_OK, "got %08x\n", r); + ok(upos.QuadPart == 1, "got %d\n", upos.u.LowPart); + + r = IStream_Stat(stm, &stat, STATFLAG_NONAME); + ok(r == S_OK, "got %08x\n", r); + ok(stat.cbSize.QuadPart == 1, "got %d\n", stat.cbSize.u.LowPart); + IStream_Release(stm); IStorage_Commit(stg, STGC_DEFAULT); IStorage_Release(stg); + r = StgOpenStorage( filename, NULL, STGM_SIMPLE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, NULL, 0, &stg); + ok(r == S_OK, "got %08x\n", r); + + r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stm); + ok(r == S_OK, "got %08x\n", r); + + r = IStream_Stat(stm, &stat, STATFLAG_NONAME); + ok(r == S_OK, "got %08x\n", r); + ok(stat.cbSize.QuadPart == 6000, "got %d\n", stat.cbSize.u.LowPart); + + IStream_Release(stm); + + IStorage_Release(stg); + DeleteFileW(filename); }

1 0

Huw Davies : ole32: In simple mode, CreateStream with the STGM_CREATE flag should fail.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: cc8c36c44c7b761eaa4bf3e1c461999f12e5a48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc8c36c44c7b761eaa4bf3e1c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 1 11:06:10 2009 +0100 ole32: In simple mode, CreateStream with the STGM_CREATE flag should fail. --- dlls/ole32/storage32.c | 3 +++ dlls/ole32/tests/storage32.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 670d751..212c1ff 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -992,6 +992,9 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( return STG_E_ACCESSDENIED; } + if(This->ancestorStorage->base.openFlags & STGM_SIMPLE) + if(grfMode & STGM_CREATE) return STG_E_INVALIDFLAG; + /* * Initialize the out parameter */ diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 55f7145..b426d94 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1343,6 +1343,39 @@ void test_readonly(void) DeleteFileA("winetest"); } +static void test_simple(void) +{ + /* Tests for STGM_SIMPLE mode */ + + static const WCHAR szPrefix[] = { 's','t','g',0 }; + static const WCHAR szDot[] = { '.',0 }; + WCHAR filename[MAX_PATH]; + IStorage *stg; + HRESULT r; + IStream *stm; + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + + if(!GetTempFileNameW(szDot, szPrefix, 0, filename)) + return; + + DeleteFileW(filename); + + r = StgCreateDocfile( filename, STGM_SIMPLE | STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stg); + ok(r == S_OK, "got %08x\n", r); + + r = IStorage_CreateStream(stg, stmname, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); + ok(r == STG_E_INVALIDFLAG, "got %08x\n", r); + r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); + ok(r == S_OK, "got %08x\n", r); + + IStream_Release(stm); + + IStorage_Commit(stg, STGC_DEFAULT); + IStorage_Release(stg); + + DeleteFileW(filename); +} + START_TEST(storage32) { test_hglobal_storage_stat(); @@ -1357,4 +1390,5 @@ START_TEST(storage32) test_access(); test_writeclassstg(); test_readonly(); + test_simple(); }

1 0

Huw Davies : ole32: Store the creation flag - STGM_SIMPLE depends on this.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 0faf155887b704b82d23a58c91dbf6578c1335ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=0faf155887b704b82d23a58c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 29 17:14:41 2009 +0100 ole32: Store the creation flag - STGM_SIMPLE depends on this. --- dlls/ole32/storage32.c | 14 +------------- dlls/ole32/storage32.h | 2 ++ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 91f1f36..670d751 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2407,19 +2407,13 @@ static HRESULT StorageImpl_Construct( memset(This, 0, sizeof(StorageImpl)); - /* - * Initialize stream list - */ - list_init(&This->base.strmHead); - /* - * Initialize the virtual function table. - */ This->base.lpVtbl = &Storage32Impl_Vtbl; This->base.pssVtbl = &IPropertySetStorage_Vtbl; This->base.v_destructor = StorageImpl_Destroy; This->base.openFlags = (openFlags & ~STGM_CREATE); + This->create = create; /* * This is the top-level storage so initialize the ancestor pointer @@ -2427,14 +2421,8 @@ static HRESULT StorageImpl_Construct( */ This->base.ancestorStorage = This; - /* - * Initialize the physical support of the storage. - */ This->hFile = hFile; - /* - * Store copy of file path. - */ if(pwcsName) { This->pwcsName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pwcsName)+1)*sizeof(WCHAR)); diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 1e42afb..4be0631 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -255,6 +255,8 @@ struct StorageImpl */ HANDLE hFile; /* Physical support for the Docfile */ LPOLESTR pwcsName; /* Full path of the document file */ + BOOL create; /* Was the storage created or opened. + The behaviour of STGM_SIMPLE depends on this */ /* FIXME: should this be in Storage32BaseImpl ? */ WCHAR filename[PROPERTY_NAME_BUFFER_LEN];

1 0

Huw Davies : ole32: Rename a parameter to better reflect its use.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 8b7b67712fc399239ba29217205926a41d02bc63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b7b67712fc399239ba292172… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 29 16:51:22 2009 +0100 ole32: Rename a parameter to better reflect its use. --- dlls/ole32/storage32.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 9266bb7..91f1f36 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2395,7 +2395,7 @@ static HRESULT StorageImpl_Construct( ILockBytes* pLkbyt, DWORD openFlags, BOOL fileBased, - BOOL fileCreate) + BOOL create) { HRESULT hr = S_OK; StgProperty currentProperty; @@ -2457,7 +2457,7 @@ static HRESULT StorageImpl_Construct( if (This->bigBlockFile == 0) return E_FAIL; - if (fileCreate) + if (create) { ULARGE_INTEGER size; BYTE bigBlockBuffer[BIG_BLOCK_SIZE]; @@ -2538,7 +2538,7 @@ static HRESULT StorageImpl_Construct( /* * Write the root property (memory only) */ - if (fileCreate) + if (create) { StgProperty rootProp; /*

1 0

Ken Sharp : shell32: Add stub for InitNetworkAddressControl.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 6ed93bf82408e3a3c3ee918e0786e88e6cea8d22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ed93bf82408e3a3c3ee918e0… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Mon Jun 1 08:51:50 2009 +0100 shell32: Add stub for InitNetworkAddressControl. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shell32_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 9c4e1ed..9d4808f 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -304,6 +304,7 @@ @ stdcall FindExecutableW(wstr wstr ptr) @ stub FixupOptionalComponents @ stdcall FreeIconList(long) +@ stdcall InitNetworkAddressControl() @ stub InternalExtractIconListA @ stub InternalExtractIconListW @ stub OCInstall diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 6a4848f..41c2d59 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1203,3 +1203,12 @@ BOOL WINAPI ExtractVersionResource16W(LPWSTR s, DWORD d) FIXME("(%s %x) stub!\n", debugstr_w(s), d); return FALSE; } + +/*********************************************************************** + * InitNetworkAddressControl (SHELL32.@) + */ +BOOL WINAPI InitNetworkAddressControl(void) +{ + FIXME("stub\n"); + return FALSE; +}

1 0

Alexandre Julliard : rpcrt4: Retrieve the stubless information for the thunks directly from the virtual table pointer .
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 449a82866dcfaca83d469838e3b15e3838186671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=449a82866dcfaca83d469838e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 21:32:56 2009 +0200 rpcrt4: Retrieve the stubless information for the thunks directly from the virtual table pointer. --- dlls/rpcrt4/cproxy.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 9854e81..887de87 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -46,7 +46,6 @@ typedef struct { const IRpcProxyBufferVtbl *lpVtbl; LPVOID *PVtbl; LONG RefCount; - const MIDL_STUBLESS_PROXY_INFO *stubless; const IID* piid; LPUNKNOWN pUnkOuter; PCInterfaceName name; @@ -83,11 +82,9 @@ __ASM_GLOBAL_FUNC(call_stubless_func, HRESULT WINAPI ObjectStubless(DWORD *args) { DWORD index = args[0]; - LPVOID iface = (LPVOID)args[2]; - - ICOM_THIS_MULTI(StdProxyImpl,PVtbl,iface); - - const MIDL_STUBLESS_PROXY_INFO *stubless = This->stubless; + void **iface = (void **)args[2]; + const void **vtbl = (const void **)*iface; + const MIDL_STUBLESS_PROXY_INFO *stubless = *(const MIDL_STUBLESS_PROXY_INFO **)(vtbl - 2); const PFORMAT_STRING fs = stubless->ProcFormatString + stubless->FormatStringOffset[index]; /* store bytes to remove from stack */ @@ -162,7 +159,6 @@ HRESULT StdProxy_Construct(REFIID riid, LPVOID *ppvObj) { StdProxyImpl *This; - const MIDL_STUBLESS_PROXY_INFO *stubless = NULL; PCInterfaceName name = ProxyInfo->pNamesArray[Index]; CInterfaceProxyVtbl *vtbl = ProxyInfo->pProxyVtblList[Index]; @@ -171,9 +167,8 @@ HRESULT StdProxy_Construct(REFIID riid, /* TableVersion = 2 means it is the stubless version of CInterfaceProxyVtbl */ if (ProxyInfo->TableVersion > 1) { ULONG count = ProxyInfo->pStubVtblList[Index]->header.DispatchTableCount; - stubless = *(const void **)vtbl; vtbl = (CInterfaceProxyVtbl *)((const void **)vtbl + 1); - TRACE("stubless %p vtbl %p: count=%d\n", stubless, vtbl->Vtbl, count ); + TRACE("stubless vtbl %p: count=%d\n", vtbl->Vtbl, count ); fill_stubless_table( (IUnknownVtbl *)vtbl->Vtbl, count ); } @@ -192,7 +187,6 @@ HRESULT StdProxy_Construct(REFIID riid, This->PVtbl = vtbl->Vtbl; /* one reference for the proxy */ This->RefCount = 1; - This->stubless = stubless; This->piid = vtbl->header.piid; This->pUnkOuter = pUnkOuter; This->name = name;

1 0

Alexandre Julliard : rpcrt4: Use the same allocation technique as delegated stubs for the stubless thunks .
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: acfebea667ca88ed3871ab58dcb595104896422c URL: http://source.winehq.org/git/wine.git/?a=commit;h=acfebea667ca88ed3871ab58d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 21:19:56 2009 +0200 rpcrt4: Use the same allocation technique as delegated stubs for the stubless thunks. This avoids allocating them on the heap, and avoids the need for a separate vtbl. --- dlls/rpcrt4/cproxy.c | 102 ++++++++++++++++++++++++++++---------------------- 1 files changed, 57 insertions(+), 45 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 22af343..9854e81 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -40,8 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -struct StublessThunk; - /* I don't know what MS's std proxy structure looks like, so this probably doesn't match, but that shouldn't matter */ typedef struct { @@ -54,7 +52,6 @@ typedef struct { PCInterfaceName name; LPPSFACTORYBUFFER pPSFactory; LPRPCCHANNELBUFFER pChannel; - struct StublessThunk *thunks; } StdProxyImpl; static const IRpcProxyBufferVtbl StdProxy_Vtbl; @@ -65,7 +62,7 @@ static const IRpcProxyBufferVtbl StdProxy_Vtbl; #include "pshpack1.h" -struct StublessThunk { +struct thunk { BYTE push; DWORD index; BYTE jmp; @@ -74,12 +71,6 @@ struct StublessThunk { #include "poppack.h" -#define FILL_STUBLESS(x,idx) \ - x->push = 0x68; /* pushl [immediate] */ \ - x->index = (idx); \ - x->jmp = 0xe9; /* jmp */ \ - x->handler = (char*)call_stubless_func - (char*)(&x->handler + 1); - extern void call_stubless_func(void); __ASM_GLOBAL_FUNC(call_stubless_func, "pushl %esp\n\t" /* pointer to index */ @@ -106,12 +97,59 @@ HRESULT WINAPI ObjectStubless(DWORD *args) return NdrClientCall2(stubless->pStubDesc, fs, args + 2); } +#define BLOCK_SIZE 1024 +#define MAX_BLOCKS 64 /* 64k methods should be enough for anybody */ + +static const struct thunk *method_blocks[MAX_BLOCKS]; + +static const struct thunk *allocate_block( unsigned int num ) +{ + unsigned int i; + struct thunk *prev, *block; + + block = VirtualAlloc( NULL, BLOCK_SIZE * sizeof(*block), + MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE ); + if (!block) return NULL; + + for (i = 0; i < BLOCK_SIZE; i++) + { + block[i].push = 0x68; /* pushl */ + block[i].index = BLOCK_SIZE * num + i + 3; + block[i].jmp = 0xe9; /* jmp */ + block[i].handler = (char *)call_stubless_func - (char *)(&block[i].handler + 1); + } + VirtualProtect( block, BLOCK_SIZE * sizeof(*block), PAGE_EXECUTE_READ, NULL ); + prev = InterlockedCompareExchangePointer( (void **)&method_blocks[num], block, NULL ); + if (prev) /* someone beat us to it */ + { + VirtualFree( block, 0, MEM_RELEASE ); + block = prev; + } + return block; +} + +static BOOL fill_stubless_table( IUnknownVtbl *vtbl, DWORD num ) +{ + const void **entry = (const void **)(vtbl + 1); + DWORD i, j; + + for (i = 0; i < (num - 3 + BLOCK_SIZE - 1) / BLOCK_SIZE; i++) + { + const struct thunk *block = method_blocks[i]; + if (!block && !(block = allocate_block( i ))) return FALSE; + for (j = 0; j < BLOCK_SIZE && j < num - 3 - i * BLOCK_SIZE; j++, entry++) + if (*entry == (LPVOID)-1) *entry = &block[j]; + } + return TRUE; +} + #else /* __i386__ */ -/* can't do that on this arch */ -struct StublessThunk { int dummy; }; -#define FILL_STUBLESS(x,idx) \ - ERR("stubless proxies are not supported on this architecture\n"); +static BOOL fill_stubless_table( IUnknownVtbl *vtbl, DWORD num ) +{ + ERR("stubless proxies are not supported on this architecture\n"); + return FALSE; +} #endif /* __i386__ */ @@ -132,13 +170,14 @@ HRESULT StdProxy_Construct(REFIID riid, /* TableVersion = 2 means it is the stubless version of CInterfaceProxyVtbl */ if (ProxyInfo->TableVersion > 1) { + ULONG count = ProxyInfo->pStubVtblList[Index]->header.DispatchTableCount; stubless = *(const void **)vtbl; vtbl = (CInterfaceProxyVtbl *)((const void **)vtbl + 1); - TRACE("stubless=%p\n", stubless); + TRACE("stubless %p vtbl %p: count=%d\n", stubless, vtbl->Vtbl, count ); + fill_stubless_table( (IUnknownVtbl *)vtbl->Vtbl, count ); } - TRACE("iid=%s\n", debugstr_guid(vtbl->header.piid)); - TRACE("vtbl=%p\n", vtbl->Vtbl); + TRACE("iid=%s vtbl=%p\n", debugstr_guid(vtbl->header.piid), vtbl->Vtbl); if (!IsEqualGUID(vtbl->header.piid, riid)) { ERR("IID mismatch during proxy creation\n"); @@ -148,32 +187,9 @@ HRESULT StdProxy_Construct(REFIID riid, This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(StdProxyImpl)); if (!This) return E_OUTOFMEMORY; - if (stubless) { - CInterfaceStubVtbl *svtbl = ProxyInfo->pStubVtblList[Index]; - ULONG i, count = svtbl->header.DispatchTableCount; - /* Maybe the original vtbl is just modified directly to point at - * ObjectStublessClientXXX thunks in real Windows, but I don't like it - */ - TRACE("stubless thunks: count=%d\n", count); - This->thunks = HeapAlloc(GetProcessHeap(),0,sizeof(struct StublessThunk)*count); - This->PVtbl = HeapAlloc(GetProcessHeap(),0,sizeof(LPVOID)*count); - for (i=0; i<count; i++) { - struct StublessThunk *thunk = &This->thunks[i]; - if (vtbl->Vtbl[i] == (LPVOID)-1) { - FILL_STUBLESS(thunk, i) - This->PVtbl[i] = thunk; - } - else { - memset(thunk, 0, sizeof(struct StublessThunk)); - This->PVtbl[i] = vtbl->Vtbl[i]; - } - } - } - else - This->PVtbl = vtbl->Vtbl; - if (!pUnkOuter) pUnkOuter = (IUnknown *)This; This->lpVtbl = &StdProxy_Vtbl; + This->PVtbl = vtbl->Vtbl; /* one reference for the proxy */ This->RefCount = 1; This->stubless = stubless; @@ -198,10 +214,6 @@ static void StdProxy_Destruct(LPRPCPROXYBUFFER iface) IRpcProxyBuffer_Disconnect(iface); IPSFactoryBuffer_Release(This->pPSFactory); - if (This->thunks) { - HeapFree(GetProcessHeap(),0,This->PVtbl); - HeapFree(GetProcessHeap(),0,This->thunks); - } HeapFree(GetProcessHeap(),0,This); }

1 0

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 June 2009