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

Benjamin Arai : oleaut32: Updated conformance test return string for VT_RESERVED.
by Alexandre Julliard Aug. 24, 2006

Aug. 24, 2006

Module: wine Branch: master Commit: 6aaf2af5c0b95d7599bfc02425f0961b96504dcf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6aaf2af5c0b95d7599bfc02… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Wed Aug 23 19:28:04 2006 -0700 oleaut32: Updated conformance test return string for VT_RESERVED. --- dlls/oleaut32/tests/vartest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 5a0afd0..cfcf1f0 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -210,7 +210,7 @@ static const char *vtstr(int x) case 0x4000: return "VT_BYREF"; case 0x8000: - return "VT_BYREF"; + return "VT_RESERVED"; case 0xFFFF: return "VT_ILLEGAL";

1 0

Andrew Talbot : winedump: Cast-qual warnings fix.
by Alexandre Julliard Aug. 24, 2006

Aug. 24, 2006

Module: wine Branch: master Commit: d4c35ae0cb4ecfd63e2a500dc8c8159298675b1f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d4c35ae0cb4ecfd63e2a500… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Aug 23 21:29:21 2006 +0100 winedump: Cast-qual warnings fix. --- tools/winedump/debug.c | 58 ++++++++++++++++++++++-------------------------- tools/winedump/dump.c | 14 ++++++------ 2 files changed, 33 insertions(+), 39 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 7cffa19..07ae75c 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -116,8 +116,8 @@ static int dump_cv_sst_module(const OMFD printf(" cSeg: %u\n", module->cSeg); printf(" Style: %c%c\n", module->Style[0], module->Style[1]); printf(" Name: %.*s\n", - *(BYTE*)((char*)(module + 1) + sizeof(OMFSegDesc) * module->cSeg), - (char*)(module + 1) + sizeof(OMFSegDesc) * module->cSeg + 1); + *(const BYTE*)((const char*)(module + 1) + sizeof(OMFSegDesc) * module->cSeg), + (const char*)(module + 1) + sizeof(OMFSegDesc) * module->cSeg + 1); segDesc = PRD(Offset(module + 1), sizeof(OMFSegDesc) * module->cSeg); if (!segDesc) {printf("Can't get the OMF-SegDesc, aborting\n"); return FALSE;} @@ -166,7 +166,7 @@ static int dump_cv_sst_global_pub(const { /* Point to the next PUBSYM32 in the table. */ - sym = (PUBSYM32*)curpos; + sym = (const PUBSYM32*)curpos; if (sym->reclen < sizeof(PUBSYM32)) break; @@ -264,7 +264,7 @@ static int dump_cv_sst_src_module(const if (!rawdata) {printf("Can't get srcModule subsection details, aborting\n");return FALSE;} /* FIXME: check ptr validity */ - sourceModule = (void*)rawdata; + sourceModule = (const void*)rawdata; printf (" Module table: Found %d file(s) and %d segment(s)\n", sourceModule->cFile, sourceModule->cSeg); for (i = 0; i < sourceModule->cFile; i++) @@ -274,9 +274,9 @@ static int dump_cv_sst_src_module(const } /* FIXME: check ptr validity */ - seg_info_dw = (void*)((char*)(sourceModule + 1) + + seg_info_dw = (const void*)((const char*)(sourceModule + 1) + sizeof(unsigned long) * (sourceModule->cFile - 1)); - seg_info_w = (unsigned short*)(&seg_info_dw[sourceModule->cSeg * 2]); + seg_info_w = (const unsigned short*)(&seg_info_dw[sourceModule->cSeg * 2]); for (i = 0; i < sourceModule->cSeg; i++) { printf (" Segment #%2d start = 0x%lx, end = 0x%lx, seg index = %u\n", @@ -299,14 +299,14 @@ static int dump_cv_sst_src_module(const * char file name (length is previous field) */ /* FIXME: check ptr validity */ - sourceFile = (void*)(rawdata + ofs); - seg_info_dw = (void*)((char*)sourceFile + 2 * sizeof(unsigned short) + + sourceFile = (const void*)(rawdata + ofs); + seg_info_dw = (const void*)((const char*)sourceFile + 2 * sizeof(unsigned short) + sourceFile->cSeg * sizeof(unsigned long)); ofs += 2 * sizeof(unsigned short) + 3 * sourceFile->cSeg * sizeof(unsigned long); printf(" File table: %.*s\n", - *(BYTE*)((char*)sourceModule + ofs), (char*)sourceModule + ofs + 1); + *(const BYTE*)((const char*)sourceModule + ofs), (const char*)sourceModule + ofs + 1); for (i = 0; i < sourceFile->cSeg; i++) { @@ -314,14 +314,14 @@ static int dump_cv_sst_src_module(const i + 1, seg_info_dw[i * 2], seg_info_dw[(i * 2) + 1], sourceFile->baseSrcLn[i]); } /* add file name length */ - ofs += *(BYTE*)((char*)sourceModule + ofs) + 1; + ofs += *(const BYTE*)((const char*)sourceModule + ofs) + 1; ofs = (ofs + 3) & ~3; for (i = 0; i < sourceModule->cSeg; i++) { - sourceLine = (void*)(rawdata + ofs); - seg_info_dw = (void*)((char*)sourceLine + 2 * sizeof(unsigned short)); - seg_info_w = (void*)(&seg_info_dw[sourceLine->cLnOff]); + sourceLine = (const void*)(rawdata + ofs); + seg_info_dw = (const void*)((const char*)sourceLine + 2 * sizeof(unsigned short)); + seg_info_w = (const void*)(&seg_info_dw[sourceLine->cLnOff]); printf (" Line table #%2d: Found %d line numbers for segment index %d\n", i, sourceLine->cLnOff, sourceLine->Seg); @@ -421,8 +421,8 @@ static void dump_codeview_headers(unsign if (memcmp(signature->Signature, "NB10", 4) == 0) { - struct {DWORD TimeStamp; DWORD Dunno; char Name[1];}* pdb_data; - pdb_data = (void*)(signature + 1); + const struct {DWORD TimeStamp; DWORD Dunno; char Name[1];} *pdb_data; + pdb_data = (const void *)(signature + 1); printf(" TimeStamp: %08lX (%s)\n", pdb_data->TimeStamp, get_time_str(pdb_data->TimeStamp)); @@ -485,7 +485,7 @@ static void dump_codeview_headers(unsign dump_codeview_all_modules(dirHeader); } -static const char* get_coff_name( PIMAGE_SYMBOL coff_sym, const char* coff_strtab ) +static const char *get_coff_name( const IMAGE_SYMBOL *coff_sym, const char *coff_strtab ) { static char namebuff[9]; const char* nampnt; @@ -508,21 +508,15 @@ static const char* get_coff_name( PIMA void dump_coff(unsigned long coffbase, unsigned long len, const void* pmt) { - PIMAGE_COFF_SYMBOLS_HEADER coff; - PIMAGE_SYMBOL coff_sym; - PIMAGE_SYMBOL coff_symbols; - PIMAGE_LINENUMBER coff_linetab; - char * coff_strtab; - const IMAGE_SECTION_HEADER * sectHead = pmt; - unsigned int i; - const char * nampnt; - int naux; - - coff = (PIMAGE_COFF_SYMBOLS_HEADER)PRD(coffbase, len); - - coff_symbols = (PIMAGE_SYMBOL) ((char *)coff + coff->LvaToFirstSymbol); - coff_linetab = (PIMAGE_LINENUMBER) ((char *)coff + coff->LvaToFirstLinenumber); - coff_strtab = (char *) (coff_symbols + coff->NumberOfSymbols); + const IMAGE_COFF_SYMBOLS_HEADER *coff = (const IMAGE_COFF_SYMBOLS_HEADER *)PRD(coffbase, len); + const IMAGE_SYMBOL *coff_sym; + const IMAGE_SYMBOL *coff_symbols = + (const IMAGE_SYMBOL *) ((const char *)coff + coff->LvaToFirstSymbol); + const char *coff_strtab = (const char *) (coff_symbols + coff->NumberOfSymbols); + const IMAGE_SECTION_HEADER *sectHead = pmt; + unsigned int i; + const char *nampnt; + int naux; printf("\nDebug table: COFF format. modbase %p, coffbase %p\n", PRD(0, 0), coff); printf(" ID | seg:offs [ abs ] | symbol/function name\n"); @@ -533,7 +527,7 @@ void dump_coff(unsigned long coffbase, u if( coff_sym->StorageClass == IMAGE_SYM_CLASS_FILE ) { - printf("file %s\n", (char *) (coff_sym + 1)); + printf("file %s\n", (const char *) (coff_sym + 1)); i += naux; continue; } diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index e3124e9..56c1df7 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -79,12 +79,12 @@ void dump_data( const unsigned char *ptr printf( "\n" ); } -const char* get_time_str(unsigned long _t) +const char *get_time_str(const unsigned long _t) { - time_t t = (time_t)_t; - const char *str = ctime(&t); - size_t len; - static char buf[128]; + const time_t t = (const time_t)_t; + const char *str = ctime(&t); + size_t len; + static char buf[128]; if (!str) /* not valid time */ { @@ -141,7 +141,7 @@ unsigned long Offset(const void* ptr) { if (ptr < dump_base) {printf("<<<<<ptr below\n");return 0;} if ((const char *)ptr >= (const char*)dump_base + dump_total_len) {printf("<<<<<ptr above\n");return 0;} - return (char*)ptr - (char*)dump_base; + return (const char *)ptr - (const char *)dump_base; } static void do_dump( enum FileSig sig, const void* pmt ) @@ -216,7 +216,7 @@ static enum FileSig check_headers(void) sig = SIG_UNKNOWN; break; default: - printf("No known main signature (%.2s/%x), aborting\n", (char*)pw, *pw); + printf("No known main signature (%.2s/%x), aborting\n", (const char *)pw, *pw); sig = SIG_UNKNOWN; }

1 0

James Liggett : winex11.drv: Fix explorer regression caused by systray patch
by Alexandre Julliard Aug. 24, 2006

Aug. 24, 2006

Module: wine Branch: master Commit: 8a75f3bb79b778d9426d2bd79b12665c6c4d8044 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8a75f3bb79b778d9426d2bd… Author: James Liggett <jrliggett(a)cox.net> Date: Wed Aug 23 13:35:02 2006 -0700 winex11.drv: Fix explorer regression caused by systray patch Move systray_dock_window call to X11DRV_CreateWindow so that it can safely call SetWindowPos without having _CheckNotSysLevel crash the explorer. --- dlls/winex11.drv/window.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 30ef89b..f540442 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -515,10 +515,6 @@ void X11DRV_set_wm_hints( Display *displ /* size hints */ set_size_hints( display, data, style ); - - /* Dock system tray windows. */ - if (ex_style & WS_EX_TRAYWINDOW) - systray_dock_window( display, data ); /* set the WM_CLIENT_MACHINE and WM_LOCALE_NAME properties */ XSetWMProperties(display, data->whole_window, NULL, NULL, NULL, 0, NULL, NULL, NULL); @@ -1168,6 +1164,12 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CRE newPos.right, newPos.bottom, swFlag ); } + /* Dock system tray windows. */ + /* Dock after the window is created so we don't have problems calling + * SetWindowPos. */ + if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_TRAYWINDOW) + systray_dock_window( display, data ); + return TRUE; failed:

1 0

Clinton Stimpson : riched20: Add tests for EM_GETMODIFY.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: bbd05a4644ff7752cdacdaa447da1c6e2d82adcf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bbd05a4644ff7752cdacdaa… Author: Clinton Stimpson <cjstimpson(a)afinternet.net> Date: Tue Aug 22 20:09:16 2006 -0600 riched20: Add tests for EM_GETMODIFY. --- dlls/riched20/editor.c | 2 dlls/riched20/tests/editor.c | 194 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 195 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 02358d3..15d2654 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1626,7 +1626,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND size_t len = wszText ? lstrlenW(wszText) : 0; int from, to; ME_Style *style; - TRACE("EM_SETTEXEX - %s, flags %d, cp %d\n", debugstr_w(wszText), (int)pStruct->flags, pStruct->codepage); + TRACE("EM_SETTEXTEX - %s, flags %d, cp %d\n", debugstr_w(wszText), (int)pStruct->flags, pStruct->codepage); if (pStruct->codepage != 1200) { FIXME("EM_SETTEXTEX only supports unicode right now!\n"); return 0; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index e9a7550..9d3df13 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -50,6 +50,7 @@ struct find_s { int _todo_wine; }; + struct find_s find_tests[] = { /* Find in empty text */ {0, -1, "foo", FR_DOWN, -1, 0}, @@ -1123,6 +1124,198 @@ static void test_WM_SETFONT() DestroyWindow(hwndRichEdit); } + +static DWORD CALLBACK test_EM_GETMODIFY_esCallback(DWORD_PTR dwCookie, + LPBYTE pbBuff, + LONG cb, + LONG *pcb) +{ + const char** str = (const char**)dwCookie; + int size = strlen(*str); + if(size > 3) /* let's make it peice-meal for fun */ + size = 3; + *pcb = cb; + if (*pcb > size) { + *pcb = size; + } + if (*pcb > 0) { + memcpy(pbBuff, *str, *pcb); + *str += *pcb; + } + return 0; +} + +static void test_EM_GETMODIFY(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + LRESULT result; + SETTEXTEX setText; + WCHAR TestItem1[] = {'T', 'e', 's', 't', + 'S', 'o', 'm', 'e', + 'T', 'e', 'x', 't', 0}; + WCHAR TestItem2[] = {'T', 'e', 's', 't', + 'S', 'o', 'm', 'e', + 'O', 't', 'h', 'e', 'r', + 'T', 'e', 'x', 't', 0}; + const char* streamText = "hello world"; + CHARFORMAT2 cf2; + PARAFORMAT2 pf2; + EDITSTREAM es; + + HFONT testFont = CreateFontA (0,0,0,0,FW_LIGHT, 0, 0, 0, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | + FF_DONTCARE, "Courier"); + + setText.codepage = 1200; /* no constant for unicode */ + setText.flags = ST_KEEPUNDO; + + + /* modify flag shouldn't be set when richedit is first created */ + result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); + ok (result == 0, + "EM_GETMODIFY returned non-zero, instead of zero on create\n"); + + /* setting modify flag should actually set it */ + SendMessage(hwndRichEdit, EM_SETMODIFY, TRUE, 0); + result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); + ok (result != 0, + "EM_GETMODIFY returned zero, instead of non-zero on EM_SETMODIFY\n"); + + /* clearing modify flag should actually clear it */ + SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); + result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); + ok (result == 0, + "EM_GETMODIFY returned non-zero, instead of zero on EM_SETMODIFY\n"); + + /* setting font doesn't change modify flag */ + SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); + SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont,(LPARAM) MAKELONG((WORD) TRUE, 0)); + result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); + todo_wine { + ok (result == 0, + "EM_GETMODIFY returned non-zero, instead of zero on setting font\n"); + } + + /* setting text should set modify flag */ + SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); + ok (result != 0, + "EM_GETMODIFY returned zero, instead of non-zero on setting text\n"); + + /* undo previous text doesn't reset modify flag */ + SendMessage(hwndRichEdit, WM_UNDO, 0, 0); + result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); + todo_wine { + ok (result != 0, + "EM_GETMODIFY returned zero, instead of non-zero on undo after setting text\n"); + } + + /* set text with no flag to keep undo stack should not set modify flag */ + SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); + setText.flags = 0; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); + todo_wine { + ok (result == 0, + "EM_GETMODIFY returned non-zero, instead of zero when setting text while not keeping undo stack\n"); + } + + /* WM_SETTEXT doesn't modify */ + SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)TestItem2); + result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); + todo_wine { + ok (result == 0, + "EM_GETMODIFY returned non-zero for WM_SETTEXT\n"); + } + + /* clear the text */ + SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); + SendMessage(hwndRichEdit, WM_CLEAR, 0, 0); + result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); + ok (result == 0, + "EM_GETMODIFY returned non-zero, instead of zero for WM_CLEAR\n"); + + /* replace text */ + SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + SendMessage(hwndRichEdit, EM_SETSEL, 0, 2); + SendMessage(hwndRichEdit, EM_REPLACESEL, TRUE, (LPARAM)TestItem2); + result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); + ok (result != 0, + "EM_GETMODIFY returned zero, instead of non-zero when replacing text\n"); + + /* copy/paste text 1 */ + SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); + SendMessage(hwndRichEdit, EM_SETSEL, 0, 2); + SendMessage(hwndRichEdit, WM_COPY, 0, 0); + SendMessage(hwndRichEdit, WM_PASTE, 0, 0); + result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); + ok (result != 0, + "EM_GETMODIFY returned zero, instead of non-zero when pasting identical text\n"); + + /* copy/paste text 2 */ + SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); + SendMessage(hwndRichEdit, EM_SETSEL, 0, 2); + SendMessage(hwndRichEdit, WM_COPY, 0, 0); + SendMessage(hwndRichEdit, EM_SETSEL, 0, 3); + SendMessage(hwndRichEdit, WM_PASTE, 0, 0); + result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); + ok (result != 0, + "EM_GETMODIFY returned zero, instead of non-zero when pasting different text\n"); + + /* press char */ + SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); + SendMessage(hwndRichEdit, EM_SETSEL, 0, 1); + SendMessage(hwndRichEdit, WM_CHAR, 'A', 0); + result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); + ok (result != 0, + "EM_GETMODIFY returned zero, instead of non-zero for WM_CHAR\n"); + + /* set char format */ + SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, (WPARAM) SCF_DEFAULT, + (LPARAM) &cf2); + cf2.dwMask = CFM_ITALIC | cf2.dwMask; + cf2.dwEffects = CFE_ITALIC ^ cf2.dwEffects; + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); + result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); + ok (result != 0, + "EM_GETMODIFY returned zero, instead of non-zero for EM_SETCHARFORMAT\n"); + + /* set para format */ + SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); + pf2.cbSize = sizeof(PARAFORMAT2); + SendMessage(hwndRichEdit, EM_GETPARAFORMAT, 0, + (LPARAM) &pf2); + pf2.dwMask = PFM_ALIGNMENT | pf2.dwMask; + pf2.wAlignment = PFA_RIGHT; + SendMessage(hwndRichEdit, EM_SETPARAFORMAT, 0, (LPARAM) &pf2); + result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); + todo_wine { + ok (result == 0, + "EM_GETMODIFY returned zero, instead of non-zero for EM_SETPARAFORMAT\n"); + } + + /* EM_STREAM */ + SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); + es.dwCookie = (DWORD_PTR)&streamText; + es.dwError = 0; + es.pfnCallback = test_EM_GETMODIFY_esCallback; + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_TEXT), (LPARAM)&es); + result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); + todo_wine { + ok (result != 0, + "EM_GETMODIFY returned zero, instead of non-zero for EM_STREAM\n"); + } + + + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { MSG msg; @@ -1147,6 +1340,7 @@ START_TEST( editor ) test_EM_EXLIMITTEXT(); test_EM_GETLIMITTEXT(); test_WM_SETFONT(); + test_EM_GETMODIFY(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Huw Davies : rpcrt4: Tests for CStdStubBuffer_Disconnect and a tidy up of the implementation.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: 487c691dc5f481e00f567f468c599b8fd2e4fea7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=487c691dc5f481e00f567f4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 23 16:36:43 2006 +0100 rpcrt4: Tests for CStdStubBuffer_Disconnect and a tidy up of the implementation. --- dlls/rpcrt4/cstub.c | 15 ++++++++------- dlls/rpcrt4/tests/cstub.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 17890e3..ac8c31b 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -149,13 +149,14 @@ HRESULT WINAPI CStdStubBuffer_Connect(LP void WINAPI CStdStubBuffer_Disconnect(LPRPCSTUBBUFFER iface) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; - TRACE("(%p)->Disconnect()\n",This); - if (This->pvServerObject) - { - IUnknown_Release(This->pvServerObject); - This->pvServerObject = NULL; - } + CStdStubBuffer *This = (CStdStubBuffer *)iface; + IUnknown *old; + TRACE("(%p)->Disconnect()\n",This); + + old = InterlockedExchangePointer((void**)&This->pvServerObject, NULL); + + if(old) + IUnknown_Release(old); } HRESULT WINAPI CStdStubBuffer_Invoke(LPRPCSTUBBUFFER iface, diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 8df8365..53261fd 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -703,6 +703,19 @@ static void test_Connect(IPSFactoryBuffe ok(connect_test_orig_release_called == 2, "release called %d\n", connect_test_orig_release_called); } +static void test_Disconnect(IPSFactoryBuffer *ppsf) +{ + IUnknownVtbl *orig_vtbl = &connect_test_orig_vtbl; + IUnknown *obj = (IUnknown*)&orig_vtbl; + IRpcStubBuffer *pstub = create_stub(ppsf, &IID_if1, obj, S_OK); + CStdStubBuffer *cstd_stub = (CStdStubBuffer*)pstub; + + connect_test_orig_release_called = 0; + IRpcStubBuffer_Disconnect(pstub); + ok(connect_test_orig_release_called == 1, "release called %d\n", connect_test_orig_release_called); + ok(cstd_stub->pvServerObject == NULL, "pvServerObject %p\n", cstd_stub->pvServerObject); +} + START_TEST( cstub ) { IPSFactoryBuffer *ppsf; @@ -713,6 +726,7 @@ START_TEST( cstub ) test_NdrStubForwardingFunction(); test_CreateStub(ppsf); test_Connect(ppsf); + test_Disconnect(ppsf); OleUninitialize(); }

1 0

Huw Davies : rpcrt4: Tests for CStdStubBuffer_Connect and fixes to make them pass.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: f42f727f7cf9472237a82ba259bd638563f105af URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f42f727f7cf9472237a82ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 23 16:37:48 2006 +0100 rpcrt4: Tests for CStdStubBuffer_Connect and fixes to make them pass. --- dlls/rpcrt4/cstub.c | 15 ++++++--- dlls/rpcrt4/tests/cstub.c | 77 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 87 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index d5dc0af..17890e3 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -134,10 +134,17 @@ ULONG WINAPI NdrCStdStubBuffer2_Release( HRESULT WINAPI CStdStubBuffer_Connect(LPRPCSTUBBUFFER iface, LPUNKNOWN lpUnkServer) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; - TRACE("(%p)->Connect(%p)\n",This,lpUnkServer); - This->pvServerObject = lpUnkServer; - return S_OK; + CStdStubBuffer *This = (CStdStubBuffer *)iface; + HRESULT r; + IUnknown *new = NULL; + + TRACE("(%p)->Connect(%p)\n",This,lpUnkServer); + + r = IUnknown_QueryInterface(lpUnkServer, STUB_HEADER(This).piid, (void**)&new); + new = InterlockedExchangePointer((void**)&This->pvServerObject, new); + if(new) + IUnknown_Release(new); + return r; } void WINAPI CStdStubBuffer_Disconnect(LPRPCSTUBBUFFER iface) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 1bd52a6..8df8365 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -628,7 +628,81 @@ static void test_CreateStub(IPSFactoryBu pstub = create_stub(ppsf, &IID_if1, obj, E_NOINTERFACE); } - + +static HRESULT WINAPI connect_test_orig_QI(IUnknown *This, REFIID iid, void **ppv) +{ + ok(IsEqualIID(iid, &IID_if1), "incorrect iid\n"); + *ppv = (void*)This; + return S_OK; +} + +static int connect_test_orig_release_called; +static ULONG WINAPI connect_test_orig_release(IUnknown *This) +{ + connect_test_orig_release_called++; + return 0; +} + +static IUnknownVtbl connect_test_orig_vtbl = +{ + connect_test_orig_QI, + NULL, + connect_test_orig_release +}; + +static HRESULT WINAPI connect_test_new_QI(IUnknown *This, REFIID iid, void **ppv) +{ + ok(IsEqualIID(iid, &IID_if1), "incorrect iid\n"); + *ppv = (void*)0xcafebabe; + return S_OK; +} + +static IUnknownVtbl connect_test_new_vtbl = +{ + connect_test_new_QI, + NULL, + NULL +}; + +static HRESULT WINAPI connect_test_new_fail_QI(IUnknown *This, REFIID iid, void **ppv) +{ + ok(IsEqualIID(iid, &IID_if1), "incorrect iid\n"); + *ppv = (void*)0xdeadbeef; + return E_NOINTERFACE; +} + +static IUnknownVtbl connect_test_new_fail_vtbl = +{ + connect_test_new_fail_QI, + NULL, + NULL +}; + + +static void test_Connect(IPSFactoryBuffer *ppsf) +{ + IUnknownVtbl *orig_vtbl = &connect_test_orig_vtbl; + IUnknownVtbl *new_vtbl = &connect_test_new_vtbl; + IUnknownVtbl *new_fail_vtbl = &connect_test_new_fail_vtbl; + IUnknown *obj = (IUnknown*)&orig_vtbl; + IRpcStubBuffer *pstub = create_stub(ppsf, &IID_if1, obj, S_OK); + CStdStubBuffer *cstd_stub = (CStdStubBuffer*)pstub; + HRESULT r; + + obj = (IUnknown*)&new_vtbl; + r = IRpcStubBuffer_Connect(pstub, obj); + ok(r == S_OK, "r %08lx\n", r); + ok(connect_test_orig_release_called == 1, "release called %d\n", connect_test_orig_release_called); + ok(cstd_stub->pvServerObject == (void*)0xcafebabe, "pvServerObject %p\n", cstd_stub->pvServerObject); + + cstd_stub->pvServerObject = (IUnknown*)&orig_vtbl; + obj = (IUnknown*)&new_fail_vtbl; + r = IRpcStubBuffer_Connect(pstub, obj); + ok(r == E_NOINTERFACE, "r %08lx\n", r); + ok(cstd_stub->pvServerObject == (void*)0xdeadbeef, "pvServerObject %p\n", cstd_stub->pvServerObject); + ok(connect_test_orig_release_called == 2, "release called %d\n", connect_test_orig_release_called); +} + START_TEST( cstub ) { IPSFactoryBuffer *ppsf; @@ -638,6 +712,7 @@ START_TEST( cstub ) ppsf = test_NdrDllGetClassObject(); test_NdrStubForwardingFunction(); test_CreateStub(ppsf); + test_Connect(ppsf); OleUninitialize(); }

1 0

Huw Davies : rpcrt4: Add tests for CreateStub and fix up CStdStubBuffer_Construct to match.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: cadc39842bbc93dc1d1552e070efcbc2d46c6c92 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cadc39842bbc93dc1d1552e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 23 14:53:24 2006 +0100 rpcrt4: Add tests for CreateStub and fix up CStdStubBuffer_Construct to match. --- dlls/rpcrt4/cstub.c | 15 ++++++++-- dlls/rpcrt4/tests/cstub.c | 66 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index ddc0dca..d5dc0af 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -54,7 +54,8 @@ HRESULT WINAPI CStdStubBuffer_Construct( LPRPCSTUBBUFFER *ppStub) { CStdStubBuffer *This; - + IUnknown *pvServer; + HRESULT r; TRACE("(%p,%p,%p,%p) %s\n", pUnkServer, vtbl, pPSFactory, ppStub, name); TRACE("iid=%s\n", debugstr_guid(vtbl->header.piid)); TRACE("vtbl=%p\n", &vtbl->Vtbl); @@ -64,16 +65,22 @@ HRESULT WINAPI CStdStubBuffer_Construct( return RPC_E_UNEXPECTED; } + r = IUnknown_QueryInterface(pUnkServer, riid, (void**)&pvServer); + if(FAILED(r)) + return r; + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(CStdStubBuffer)); - if (!This) return E_OUTOFMEMORY; + if (!This) { + IUnknown_Release(pvServer); + return E_OUTOFMEMORY; + } This->lpVtbl = &vtbl->Vtbl; This->RefCount = 1; - This->pvServerObject = pUnkServer; + This->pvServerObject = pvServer; This->pPSFactory = pPSFactory; *ppStub = (LPRPCSTUBBUFFER)This; - IUnknown_AddRef(This->pvServerObject); IPSFactoryBuffer_AddRef(pPSFactory); return S_OK; } diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 54aa180..1bd52a6 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -21,6 +21,7 @@ #include <stdarg.h> #define PROXY_DELEGATION +#define COBJMACROS #include "wine/test.h" #include <windef.h> @@ -426,7 +427,7 @@ const ProxyFileInfo *proxy_file_list[] = }; -static void test_NdrDllGetClassObject(void) +static IPSFactoryBuffer *test_NdrDllGetClassObject(void) { IPSFactoryBuffer *ppsf = NULL; const CLSID PSDispatch = {0x20420, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46}}; @@ -524,6 +525,7 @@ #undef VTBL_TEST_CHANGE_TO #undef VTBL_TEST_ZERO ok(PSFactoryBuffer.RefCount == 1, "ref count %ld\n", PSFactoryBuffer.RefCount); + return ppsf; } static int base_buffer_invoke_called; @@ -570,12 +572,72 @@ todo_wine { } +static IRpcStubBuffer *create_stub(IPSFactoryBuffer *ppsf, REFIID iid, IUnknown *obj, HRESULT expected_result) +{ + IRpcStubBuffer *pstub = NULL; + HRESULT r; + + r = IPSFactoryBuffer_CreateStub(ppsf, iid, obj, &pstub); + ok(r == expected_result, "CreateStub returned %08lx expected %08lx\n", r, expected_result); + return pstub; +} + +static HRESULT WINAPI create_stub_test_QI(IUnknown *This, REFIID iid, void **ppv) +{ + ok(IsEqualIID(iid, &IID_if1), "incorrect iid\n"); + *ppv = (void*)0xdeadbeef; + return S_OK; +} + +static IUnknownVtbl create_stub_test_vtbl = +{ + create_stub_test_QI, + NULL, + NULL +}; + +static HRESULT WINAPI create_stub_test_fail_QI(IUnknown *This, REFIID iid, void **ppv) +{ + ok(IsEqualIID(iid, &IID_if1), "incorrect iid\n"); + *ppv = NULL; + return E_NOINTERFACE; +} + +static IUnknownVtbl create_stub_test_fail_vtbl = +{ + create_stub_test_fail_QI, + NULL, + NULL +}; + +static void test_CreateStub(IPSFactoryBuffer *ppsf) +{ + IUnknownVtbl *vtbl = &create_stub_test_vtbl; + IUnknown *obj = (IUnknown*)&vtbl; + IRpcStubBuffer *pstub = create_stub(ppsf, &IID_if1, obj, S_OK); + CStdStubBuffer *cstd_stub = (CStdStubBuffer*)pstub; + CInterfaceStubHeader *header = ((CInterfaceStubHeader *)cstd_stub->lpVtbl) - 1; + + ok(IsEqualIID(header->piid, &IID_if1), "header iid differs\n"); + ok(cstd_stub->RefCount == 1, "ref count %ld\n", cstd_stub->RefCount); + /* 0xdeadbeef returned from create_stub_test_QI */ + ok(cstd_stub->pvServerObject == (void*)0xdeadbeef, "pvServerObject %p", cstd_stub->pvServerObject); + ok(cstd_stub->pPSFactory == ppsf, "pPSFactory %p\n", cstd_stub->pPSFactory); + + vtbl = &create_stub_test_fail_vtbl; + pstub = create_stub(ppsf, &IID_if1, obj, E_NOINTERFACE); + +} + START_TEST( cstub ) { + IPSFactoryBuffer *ppsf; + OleInitialize(NULL); - test_NdrDllGetClassObject(); + ppsf = test_NdrDllGetClassObject(); test_NdrStubForwardingFunction(); + test_CreateStub(ppsf); OleUninitialize(); }

1 0

Huw Davies : rpcrt4: Add tests for NdrStubForwardingFunction and write a commented out implementation .
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: 6a0fccd3a92e773b8d713b4a56785fe23f03e809 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6a0fccd3a92e773b8d713b4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 23 13:56:04 2006 +0100 rpcrt4: Add tests for NdrStubForwardingFunction and write a commented out implementation. This shows that the IRpcStubBuffer for a delegated stub's base interface is stored at (void**)This-1. --- dlls/rpcrt4/cstub.c | 24 ++++++++++++++++++++ dlls/rpcrt4/ndr_midl.c | 10 -------- dlls/rpcrt4/tests/cstub.c | 53 ++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 74 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 0b35579..ddc0dca 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -224,3 +224,27 @@ const MIDL_SERVER_INFO *CStdStubBuffer_G CStdStubBuffer *This = (CStdStubBuffer *)iface; return STUB_HEADER(This).pServerInfo; } + +/************************************************************************ + * NdrStubForwardingFunction [RPCRT4.@] + */ +void __RPC_STUB NdrStubForwardingFunction( IRpcStubBuffer *This, IRpcChannelBuffer *pChannel, + PRPC_MESSAGE pMsg, DWORD *pdwStubPhase ) +{ + /* Once stub delegation is implemented, this should call + IRpcStubBuffer_Invoke on the stub's base interface. The + IRpcStubBuffer for this interface is stored at (void**)This-1. + The pChannel and pMsg parameters are passed intact + (RPCOLEMESSAGE is basically a RPC_MESSAGE). If Invoke returns + with a failure then an exception is raised (to see this, change + the return value in the test). + + IRpcStubBuffer *base_this = *(IRpcStubBuffer**)((void**)This - 1); + HRESULT r = IRpcStubBuffer_Invoke(base_this, (RPCOLEMESSAGE*)pMsg, pChannel); + if(FAILED(r)) RpcRaiseException(r); + return; + */ + + FIXME("Not implemented\n"); + return; +} diff --git a/dlls/rpcrt4/ndr_midl.c b/dlls/rpcrt4/ndr_midl.c index 90f8b5e..d0c6000 100644 --- a/dlls/rpcrt4/ndr_midl.c +++ b/dlls/rpcrt4/ndr_midl.c @@ -338,13 +338,3 @@ RPC_STATUS RPC_ENTRY NdrMapCommAndFaultS return RPC_S_OK; } - -/************************************************************************ - * NdrStubForwardingFunction [RPCRT4.@] - */ -void __RPC_STUB NdrStubForwardingFunction( IRpcStubBuffer *This, IRpcChannelBuffer *pChannel, - PRPC_MESSAGE pMsg, DWORD *pdwStubPhase ) -{ - FIXME("Not implemented\n"); - return; -} diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index afaf14f..54aa180 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -87,7 +87,7 @@ static const MIDL_TYPE_FORMAT_STRING __M } }; -static const MIDL_STUB_DESC Object_StubDesc = +static const MIDL_STUB_DESC Object_StubDesc = { NULL, my_alloc, @@ -443,8 +443,6 @@ static void test_NdrDllGetClassObject(vo void *CStd_DebugServerQueryInterface = GetProcAddress(hmod, "CStdStubBuffer_DebugServerQueryInterface"); void *CStd_DebugServerRelease = GetProcAddress(hmod, "CStdStubBuffer_DebugServerRelease"); - OleInitialize(NULL); - r = NdrDllGetClassObject(&PSDispatch, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, &PSDispatch, &PSFactoryBuffer); @@ -528,7 +526,56 @@ #undef VTBL_TEST_ZERO ok(PSFactoryBuffer.RefCount == 1, "ref count %ld\n", PSFactoryBuffer.RefCount); } +static int base_buffer_invoke_called; +static HRESULT WINAPI base_buffer_Invoke(IRpcStubBuffer *This, RPCOLEMESSAGE *msg, IRpcChannelBuffer *channel) +{ + base_buffer_invoke_called++; + ok(msg == (RPCOLEMESSAGE*)0xcafebabe, "msg ptr changed\n"); + ok(channel == (IRpcChannelBuffer*)0xdeadbeef, "channel ptr changed\n"); + return S_OK; /* returning any failure here results in an exception */ +} + +static IRpcStubBufferVtbl base_buffer_vtbl = { + (void*)0xcafebab0, + (void*)0xcafebab1, + (void*)0xcafebab2, + (void*)0xcafebab3, + (void*)0xcafebab4, + base_buffer_Invoke, + (void*)0xcafebab6, + (void*)0xcafebab7, + (void*)0xcafebab8, + (void*)0xcafebab9 +}; + +static void test_NdrStubForwardingFunction(void) +{ + void *This[5]; + void *real_this; + IRpcChannelBuffer *channel = (IRpcChannelBuffer*)0xdeadbeef; + RPC_MESSAGE *msg = (RPC_MESSAGE*)0xcafebabe; + DWORD *phase = (DWORD*)0x12345678; + IRpcStubBufferVtbl *base_buffer_vtbl_ptr = &base_buffer_vtbl; + IRpcStubBuffer *base_stub_buffer = (IRpcStubBuffer*)&base_buffer_vtbl_ptr; + + memset(This, 0xcc, sizeof(This)); + This[0] = base_stub_buffer; + real_this = &This[1]; + + NdrStubForwardingFunction( real_this, channel, msg, phase ); + +todo_wine { + ok(base_buffer_invoke_called == 1, "base_buffer_invoke called %d times\n", base_buffer_invoke_called); +} + +} + START_TEST( cstub ) { + OleInitialize(NULL); + test_NdrDllGetClassObject(); + test_NdrStubForwardingFunction(); + + OleUninitialize(); }

1 0

Huw Davies : rpcrt4: Tests for NdrDllGetClassObject.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: a5dcb3e39de9df18817ba402662f966320717ccd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a5dcb3e39de9df18817ba40… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 23 11:44:05 2006 +0100 rpcrt4: Tests for NdrDllGetClassObject. These show that delegated stubs need different Connect, Disconnect and CountRefs methods than non-delegated stubs (ie they don't use all of the CStdStubBuffer_* functions). --- dlls/rpcrt4/tests/Makefile.in | 4 dlls/rpcrt4/tests/cstub.c | 534 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 537 insertions(+), 1 deletions(-) create mode 100644 dlls/rpcrt4/tests/cstub.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a5dcb3e39de9df18817…

1 0

Jacek Caban : mlang: Added IMultiLanguage3 interface stub implementation.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: 1119794806c1ef696d675f75736b84b74d2c8c4a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1119794806c1ef696d675f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 23 18:15:03 2006 +0200 mlang: Added IMultiLanguage3 interface stub implementation. --- dlls/mlang/mlang.c | 133 +++++++++++++++++++++++++++++++++++----------------- 1 files changed, 89 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1119794806c1ef696d6…

1 0