October 2014 - Wine-commits

Bruno Jesus : comctl32: Remove dead assignment in tooltips.c (Cppcheck).
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: a54c187886353bd7c6bcc6d43b85e1101a0627f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a54c187886353bd7c6bcc6d43… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 00:17:34 2014 -0200 comctl32: Remove dead assignment in tooltips.c (Cppcheck). --- dlls/comctl32/tooltips.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index f74ea65..7564c3f 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -234,7 +234,7 @@ TOOLTIPS_customdraw_fill(const TOOLTIPS_INFO *infoPtr, NMTTCUSTOMDRAW *lpnmttcd, static inline DWORD TOOLTIPS_notify_customdraw (DWORD dwDrawStage, NMTTCUSTOMDRAW *lpnmttcd) { - LRESULT result = CDRF_DODEFAULT; + LRESULT result; lpnmttcd->nmcd.dwDrawStage = dwDrawStage; TRACE("Notifying stage %d, flags %x, id %x\n", lpnmttcd->nmcd.dwDrawStage,

1 0

Bruno Jesus : comctl32/tests: Remove dead assignment in comboex.c ( Cppcheck).
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 2ccd55e56f9c0d8482ca8fe5d820b95f67647b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ccd55e56f9c0d8482ca8fe5d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 00:24:38 2014 -0200 comctl32/tests: Remove dead assignment in comboex.c (Cppcheck). --- dlls/comctl32/tests/comboex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index af01839..faa32a3 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -127,7 +127,7 @@ static HWND subclass_editbox(HWND hwndComboEx) static void test_comboboxex(void) { HWND myHwnd = 0; - LONG res = -1; + LONG res; COMBOBOXEXITEMA cbexItem; static const char *first_item = "First Item", *second_item = "Second Item",

1 0

Bruno Jesus : comctl32/tests: Remove a dead assignment from dpa.c ( Cppcheck).
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 2c5f05b860d0f69b249746523374851d90ea5e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5f05b860d0f69b249746523… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 00:32:04 2014 -0200 comctl32/tests: Remove a dead assignment from dpa.c (Cppcheck). --- dlls/comctl32/tests/dpa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 644f3aa..4eb32a4 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -271,7 +271,7 @@ static void test_dpa(void) ok(rc, "dw2=0x%x\n", dw2); /* Clone into an old DPA */ - p = NULL; SetLastError(ERROR_SUCCESS); + SetLastError(ERROR_SUCCESS); p = pDPA_Clone(dpa, dpa3); ok(p == dpa3, "p=%p\n", p); rc=CheckDPA(dpa3, 0x123456, &dw3);

1 0

Iván Matellanes : msvcrt: _filbuf should not lock any file.
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: f896cd3dc9fc16586dd7ada2e95b66c677aad1ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f896cd3dc9fc16586dd7ada2e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Oct 28 14:43:35 2014 +0100 msvcrt: _filbuf should not lock any file. --- dlls/msvcr90/tests/msvcr90.c | 7 +++++++ dlls/msvcrt/file.c | 13 ++----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 9bb29da..184ce76 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -118,6 +118,7 @@ static int (__cdecl *p_fileno)(FILE*); static int (__cdecl *p_feof)(FILE*); static int (__cdecl *p_ferror)(FILE*); static int (__cdecl *p_flsbuf)(int, FILE*); +static int (__cdecl *p_filbuf)(FILE*); static unsigned long (__cdecl *p_byteswap_ulong)(unsigned long); static void** (__cdecl *p__pxcptinfoptrs)(void); static void* (__cdecl *p__AdjustPointer)(void*, const void*); @@ -377,6 +378,7 @@ static BOOL init(void) SET(p_feof, "feof"); SET(p_ferror, "ferror"); SET(p_flsbuf, "_flsbuf"); + SET(p_filbuf, "_filbuf"); SET(p_byteswap_ulong, "_byteswap_ulong"); SET(p__pxcptinfoptrs, "__pxcptinfoptrs"); SET(p__AdjustPointer, "__AdjustPointer"); @@ -1285,6 +1287,11 @@ static void test_nonblocking_file_access(void) ret = p_flsbuf('a', filew); ok(ret=='a', "_flsbuf(filew) returned %d\n", ret); + ret = p_filbuf(filer); + ok(ret==-1, "_filbuf(filer) returned %d\n", ret); + ret = p_filbuf(filew); + ok(ret==-1, "_filbuf(filew) returned %d\n", ret); + ret = p_fflush_nolock(filer); ok(ret==0, "_fflush_nolock(filer) returned %d\n", ret); ret = p_fflush_nolock(filew); diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2e07342..d191953 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3460,12 +3460,9 @@ int CDECL MSVCRT_ferror(MSVCRT_FILE* file) int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) { unsigned char c; - MSVCRT__lock_file(file); - if(file->_flag & MSVCRT__IOSTRG) { - MSVCRT__unlock_file(file); + if(file->_flag & MSVCRT__IOSTRG) return MSVCRT_EOF; - } /* Allocate buffer if needed */ if(!(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF))) @@ -3474,35 +3471,29 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) if(!(file->_flag & MSVCRT__IOREAD)) { if(file->_flag & MSVCRT__IORW) file->_flag |= MSVCRT__IOREAD; - else { - MSVCRT__unlock_file(file); + else return MSVCRT_EOF; - } } if(!(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { int r; if ((r = read_i(file->_file,&c,1)) != 1) { file->_flag |= (r == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; - MSVCRT__unlock_file(file); return MSVCRT_EOF; } - MSVCRT__unlock_file(file); return c; } else { file->_cnt = read_i(file->_file, file->_base, file->_bufsiz); if(file->_cnt<=0) { file->_flag |= (file->_cnt == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; file->_cnt = 0; - MSVCRT__unlock_file(file); return MSVCRT_EOF; } file->_cnt--; file->_ptr = file->_base+1; c = *(unsigned char *)file->_base; - MSVCRT__unlock_file(file); return c; } }

1 0

Iván Matellanes : msvcrt: Added _fgetc_nolock implementation.
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 878b4a92803eeac38b218e55dc9f41a6d503deec URL: http://source.winehq.org/git/wine.git/?a=commit;h=878b4a92803eeac38b218e55d… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Oct 28 14:43:43 2014 +0100 msvcrt: Added _fgetc_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 1 + dlls/msvcr110/msvcr110.spec | 1 + dlls/msvcr80/msvcr80.spec | 1 + dlls/msvcr90/msvcr90.spec | 1 + dlls/msvcrt/file.c | 16 ++++++++++++++-- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 7 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 91805ee..e33f5fe 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -800,6 +800,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock +@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 5de6965..88144a3 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1148,6 +1148,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock +@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b7f0a86..5c01600 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -467,6 +467,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock +@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a8ad25f..d9d99f4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -449,6 +449,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock +@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d191953..dbbbe78 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3503,10 +3503,23 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) */ int CDECL MSVCRT_fgetc(MSVCRT_FILE* file) { + int ret; + + MSVCRT__lock_file(file); + ret = MSVCRT__fgetc_nolock(file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _fgetc_nolock (MSVCRT.@) + */ +int CDECL MSVCRT__fgetc_nolock(MSVCRT_FILE* file) +{ unsigned char *i; unsigned int j; - MSVCRT__lock_file(file); if (file->_cnt>0) { file->_cnt--; i = (unsigned char *)file->_ptr++; @@ -3514,7 +3527,6 @@ int CDECL MSVCRT_fgetc(MSVCRT_FILE* file) } else j = MSVCRT__filbuf(file); - MSVCRT__unlock_file(file); return j; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9f00923..137bec2 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -916,6 +916,7 @@ int __cdecl MSVCRT__isleadbyte_l(int, MSVCRT__locale_t); void __cdecl MSVCRT__lock_file(MSVCRT_FILE*); void __cdecl MSVCRT__unlock_file(MSVCRT_FILE*); int __cdecl MSVCRT_fgetc(MSVCRT_FILE*); +int __cdecl MSVCRT__fgetc_nolock(MSVCRT_FILE*); int __cdecl MSVCRT_ungetc(int,MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_fgetwc(MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_ungetwc(MSVCRT_wint_t,MSVCRT_FILE*); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 305d251..54c07fe 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -131,6 +131,7 @@ size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); int __cdecl _fclose_nolock(FILE*); int __cdecl _fflush_nolock(FILE*); +int __cdecl _fgetc_nolock(FILE*); int __cdecl _fseek_nolock(FILE*,__msvcrt_long,int); int __cdecl _fseeki64_nolock(FILE*,__int64,int); __msvcrt_long __cdecl _ftell_nolock(FILE*);

1 0

Iván Matellanes : msvcrt: Added _fgetwc_nolock implementation.
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 156684ba91e165dce614a8da94080a5c1f88d62d URL: http://source.winehq.org/git/wine.git/?a=commit;h=156684ba91e165dce614a8da9… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Oct 28 14:43:47 2014 +0100 msvcrt: Added _fgetwc_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 21 ++++++++++++++++----- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e33f5fe..80d5bc9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -802,7 +802,7 @@ @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar -@ stub _fgetwc_nolock +@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar @ cdecl _filbuf(ptr) MSVCRT__filbuf @ cdecl _filelength(long) MSVCRT__filelength diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 88144a3..283f5fd 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1150,7 +1150,7 @@ @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar -@ stub _fgetwc_nolock +@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar @ cdecl _filbuf(ptr) MSVCRT__filbuf @ cdecl _filelength(long) MSVCRT__filelength diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5c01600..a48e42b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -469,7 +469,7 @@ @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar -@ stub _fgetwc_nolock +@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar @ cdecl _filbuf(ptr) MSVCRT__filbuf @ cdecl _filelength(long) MSVCRT__filelength diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d9d99f4..e9abf00 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -451,7 +451,7 @@ @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar -@ stub _fgetwc_nolock +@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar @ cdecl _filbuf(ptr) MSVCRT__filbuf @ cdecl _filelength(long) MSVCRT__filelength diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index dbbbe78..fe3525c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3576,16 +3576,28 @@ char * CDECL MSVCRT_fgets(char *s, int size, MSVCRT_FILE* file) MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) { MSVCRT_wint_t ret; - int ch; MSVCRT__lock_file(file); + ret = MSVCRT__fgetwc_nolock(file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _fgetwc_nolock (MSVCRT.@) + */ +MSVCRT_wint_t CDECL MSVCRT__fgetwc_nolock(MSVCRT_FILE* file) +{ + MSVCRT_wint_t ret; + int ch; if((msvcrt_get_ioinfo(file->_file)->exflag & (EF_UTF8 | EF_UTF16)) || !(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) { char *p; for(p=(char*)&ret; (MSVCRT_wint_t*)p<&ret+1; p++) { - ch = MSVCRT_fgetc(file); + ch = MSVCRT__fgetc_nolock(file); if(ch == MSVCRT_EOF) { ret = MSVCRT_WEOF; break; @@ -3596,11 +3608,11 @@ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) char mbs[MSVCRT_MB_LEN_MAX]; int len = 0; - ch = MSVCRT_fgetc(file); + ch = MSVCRT__fgetc_nolock(file); if(ch != MSVCRT_EOF) { mbs[0] = (char)ch; if(MSVCRT_isleadbyte((unsigned char)mbs[0])) { - ch = MSVCRT_fgetc(file); + ch = MSVCRT__fgetc_nolock(file); if(ch != MSVCRT_EOF) { mbs[1] = (char)ch; len = 2; @@ -3614,7 +3626,6 @@ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) ret = MSVCRT_WEOF; } - MSVCRT__unlock_file(file); return ret; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 137bec2..256a90c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -919,6 +919,7 @@ int __cdecl MSVCRT_fgetc(MSVCRT_FILE*); int __cdecl MSVCRT__fgetc_nolock(MSVCRT_FILE*); int __cdecl MSVCRT_ungetc(int,MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_fgetwc(MSVCRT_FILE*); +MSVCRT_wint_t __cdecl MSVCRT__fgetwc_nolock(MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_ungetwc(MSVCRT_wint_t,MSVCRT_FILE*); int __cdecl MSVCRT__fseeki64_nolock(MSVCRT_FILE*,__int64,int); __int64 __cdecl MSVCRT__ftelli64(MSVCRT_FILE* file); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 54c07fe..768b3a0 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -196,6 +196,7 @@ unsigned int __cdecl _set_output_format(void); #ifndef _WSTDIO_DEFINED #define _WSTDIO_DEFINED +wint_t __cdecl _fgetwc_nolock(FILE*); wint_t __cdecl _fgetwchar(void); wint_t __cdecl _fputwchar(wint_t); wchar_t* __cdecl _getws(wchar_t*);

1 0

Jactry Zeng : riched20: Add IID_IRichEditOle and IID_ITextDocument support for ITextServices:: QueryInterface.
by Alexandre Julliard 30 Oct '14

30 Oct '14

Module: wine Branch: master Commit: a9491ec5d9f703e9a60e9effa4072d4d6908a2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9491ec5d9f703e9a60e9effa… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Oct 28 20:10:46 2014 +0800 riched20: Add IID_IRichEditOle and IID_ITextDocument support for ITextServices::QueryInterface. --- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 2 ++ dlls/riched20/richole.c | 33 ++++++++++++++------- dlls/riched20/tests/txtsrv.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/txtsrv.c | 11 ++++++- 5 files changed, 104 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 375b162..1e62fc1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2889,7 +2889,7 @@ void ME_DestroyEditor(ME_TextEditor *editor) ITextHost_Release(editor->texthost); if (editor->reOle) { - IRichEditOle_Release(editor->reOle); + DestroyIRichEditOle(editor->reOle); editor->reOle = NULL; } OleUninitialize(); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 255945e..d8abe4e 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -241,10 +241,12 @@ int ME_GetParaBorderWidth(const ME_Context *c, int flags) DECLSPEC_HIDDEN; /* richole.c */ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *ppvObj) DECLSPEC_HIDDEN; +void DestroyIRichEditOle(IRichEditOle *iface) DECLSPEC_HIDDEN; void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, ME_Paragraph *para, BOOL selected) DECLSPEC_HIDDEN; void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) DECLSPEC_HIDDEN; void ME_DeleteReObject(REOBJECT* reo) DECLSPEC_HIDDEN; +void ME_GetITextDocumentInterface(IRichEditOle *iface, LPVOID *ppvObj) DECLSPEC_HIDDEN; /* editor.c */ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 07ba279..0788125 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -143,17 +143,7 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface) TRACE ("%p ref=%u\n", This, ref); if (!ref) - { - ITextRangeImpl *txtRge; - TRACE ("Destroying %p\n", This); - This->txtSel->reOle = NULL; - This->editor->reOle = NULL; - ITextSelection_Release(&This->txtSel->ITextSelection_iface); - IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); - LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, entry) - txtRge->reOle = NULL; - heap_free(This); - } + DestroyIRichEditOle(&This->IRichEditOle_iface); return ref; } @@ -2375,6 +2365,21 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p return 1; } +void DestroyIRichEditOle(IRichEditOle *iface) +{ + IRichEditOleImpl *This = impl_from_IRichEditOle(iface); + ITextRangeImpl *txtRge; + + TRACE("Destroying %p\n", This); + This->txtSel->reOle = NULL; + This->editor->reOle = NULL; + ITextSelection_Release(&This->txtSel->ITextSelection_iface); + IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); + LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, entry) + txtRge->reOle = NULL; + heap_free(This); +} + static void convert_sizel(const ME_Context *c, const SIZEL* szl, SIZE* sz) { /* sizel is in .01 millimeters, sz in pixels */ @@ -2578,3 +2583,9 @@ void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) if (dst->pstg) IStorage_AddRef(dst->pstg); if (dst->polesite) IOleClientSite_AddRef(dst->polesite); } + +void ME_GetITextDocumentInterface(IRichEditOle *iface, LPVOID *ppvObj) +{ + IRichEditOleImpl *This = impl_from_IRichEditOle(iface); + *ppvObj = &This->ITextDocument_iface; +} diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 3401f8b..c154e2d 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -29,6 +29,8 @@ #include <winbase.h> #include <objbase.h> #include <richedit.h> +#include <tom.h> +#include <richole.h> #include <initguid.h> #include <imm.h> #include <textserv.h> @@ -862,6 +864,72 @@ static void test_COM(void) IUnknown_Release(unk_obj.inner_unk); } +static ULONG get_refcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + +static void test_QueryInterface(void) +{ + HRESULT hres; + IRichEditOle *reole, *txtsrv_reole; + ITextDocument *txtdoc, *txtsrv_txtdoc; + ULONG refcount; + + if(!init_texthost()) + return; + + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 1, "got wrong ref count: %d\n", refcount); + + /* IID_IRichEditOle */ + hres = ITextServices_QueryInterface(txtserv, &IID_IRichEditOle, (void **)&txtsrv_reole); + ok(hres == S_OK, "ITextServices_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_reole); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + + hres = IRichEditOle_QueryInterface(txtsrv_reole, &IID_ITextDocument, (void **)&txtdoc); + ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_reole); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + + ITextDocument_Release(txtdoc); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + IRichEditOle_Release(txtsrv_reole); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 1, "got wrong ref count: %d\n", refcount); + + /* IID_ITextDocument */ + hres = ITextServices_QueryInterface(txtserv, &IID_ITextDocument, (void **)&txtsrv_txtdoc); + ok(hres == S_OK, "ITextServices_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_txtdoc); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + + hres = ITextDocument_QueryInterface(txtsrv_txtdoc, &IID_IRichEditOle, (void **)&reole); + ok(hres == S_OK, "ITextDocument_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_txtdoc); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + + IRichEditOle_Release(reole); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + ITextDocument_Release(txtsrv_txtdoc); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 1, "got wrong ref count: %d\n", refcount); + + free_texthost(); +} + START_TEST( txtsrv ) { setup_thiscall_wrappers(); @@ -887,6 +955,7 @@ START_TEST( txtsrv ) test_TxSetText(); test_TxGetNaturalSize(); test_TxDraw(); + test_QueryInterface(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 0ca1e1b..75bee6d 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -29,6 +29,7 @@ #include "ole2.h" #include "oleauto.h" #include "richole.h" +#include "tom.h" #include "imm.h" #include "textserv.h" #include "wine/debug.h" @@ -79,7 +80,15 @@ static HRESULT WINAPI ITextServicesImpl_QueryInterface(IUnknown *iface, REFIID r *ppv = &This->IUnknown_inner; else if (IsEqualIID(riid, &IID_ITextServices)) *ppv = &This->ITextServices_iface; - else { + else if (IsEqualIID(riid, &IID_IRichEditOle) || IsEqualIID(riid, &IID_ITextDocument)) { + if (!This->editor->reOle) + if (!CreateIRichEditOle(This->outer_unk, This->editor, (void **)(&This->editor->reOle))) + return E_OUTOFMEMORY; + if (IsEqualIID(riid, &IID_ITextDocument)) + ME_GetITextDocumentInterface(This->editor->reOle, ppv); + else + *ppv = This->editor->reOle; + } else { *ppv = NULL; FIXME("Unknown interface: %s\n", debugstr_guid(riid)); return E_NOINTERFACE;

1 0

Austin English : ndis.sys: Add a stub dll.
by Alexandre Julliard 30 Oct '14

30 Oct '14

Module: wine Branch: master Commit: 779f7e527d1fd844f1c471f0ef40da69bf479a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=779f7e527d1fd844f1c471f0e… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 29 12:30:39 2014 -0500 ndis.sys: Add a stub dll. --- configure | 2 + configure.ac | 1 + dlls/ndis.sys/Makefile.in | 4 + dlls/ndis.sys/main.c | 40 +++++++ dlls/ndis.sys/ndis.sys.spec | 276 ++++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 2 + 6 files changed, 325 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=779f7e527d1fd844f1c47…

1 0

Austin English : ntoskrnl.exe: Add ObQueryNameString stub.
by Alexandre Julliard 30 Oct '14

30 Oct '14

Module: wine Branch: master Commit: 9c5f23121a4c93106142ec602da28698d128682e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c5f23121a4c93106142ec602… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 29 12:32:36 2014 -0500 ntoskrnl.exe: Add ObQueryNameString stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntifs.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7bb96fb..23379b8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1927,3 +1927,12 @@ VOID WINAPI IoStartNextPacket(PDEVICE_OBJECT deviceobject, BOOLEAN cancelable) { FIXME("(%p %d) stub\n", deviceobject, cancelable); } + +/***************************************************** + * ObQueryNameString (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ObQueryNameString(PVOID object, POBJECT_NAME_INFORMATION name, ULONG maxlength, PULONG returnlength) +{ + FIXME("(%p %p %u %p) stub\n", object, name, maxlength, returnlength); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 11aaa2b..1512cf8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -807,7 +807,7 @@ @ stub ObMakeTemporaryObject @ stub ObOpenObjectByName @ stub ObOpenObjectByPointer -@ stub ObQueryNameString +@ stdcall ObQueryNameString(ptr ptr long ptr) @ stub ObQueryObjectAuditingByHandle @ stdcall ObReferenceObjectByHandle(long long ptr long ptr ptr) @ stdcall ObReferenceObjectByName(ptr long ptr long ptr long ptr ptr) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 37ec637..a8d90a1 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -28,4 +28,6 @@ typedef struct _KQUEUE LIST_ENTRY ThreadListHead; } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; +NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); + #endif

1 0

Alexandre Julliard : cmd: Add a helper function to check if a path ends with a backslash.
by Alexandre Julliard 30 Oct '14

30 Oct '14

Module: wine Branch: master Commit: 3d3c5ab4006de7a80af421ddfeb2cad699fb03f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3c5ab4006de7a80af421ddf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 30 13:11:27 2014 +0900 cmd: Add a helper function to check if a path ends with a backslash. --- programs/cmd/builtins.c | 6 +++--- programs/cmd/directory.c | 9 ++------- programs/cmd/wcmd.h | 5 +++++ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index f7db4a9..6751d3e 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -798,12 +798,12 @@ void WCMD_copy(WCHAR * args) { /* If parameter is a directory, ensure it ends in \ */ attributes = GetFileAttributesW(destname); - if ((destname[strlenW(destname) - 1] == '\\') || + if (ends_with_backslash( destname ) || ((attributes != INVALID_FILE_ATTRIBUTES) && (attributes & FILE_ATTRIBUTE_DIRECTORY))) { destisdirectory = TRUE; - if (!(destname[strlenW(destname) - 1] == '\\')) strcatW(destname, slashW); + if (!ends_with_backslash( destname )) strcatW(destname, slashW); WINE_TRACE("Directory, so full name is now '%s'\n", wine_dbgstr_w(destname)); } } @@ -880,7 +880,7 @@ void WCMD_copy(WCHAR * args) { /* If parameter is a directory, ensure it ends in \* */ attributes = GetFileAttributesW(srcpath); - if (srcpath[strlenW(srcpath) - 1] == '\\') { + if (ends_with_backslash( srcpath )) { /* We need to know where the filename part starts, so append * and recalculate the full resulting path */ diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 678e2a1..91142be 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -833,13 +833,8 @@ void WCMD_directory (WCHAR *args) if ((strchrW(path, '*') == NULL) && (strchrW(path, '%') == NULL)) { status = GetFileAttributesW(path); if ((status != INVALID_FILE_ATTRIBUTES) && (status & FILE_ATTRIBUTE_DIRECTORY)) { - if (path[strlenW(path)-1] == '\\') { - strcatW (path, starW); - } - else { - static const WCHAR slashStarW[] = {'\\','*','\0'}; - strcatW (path, slashStarW); - } + if (!ends_with_backslash( path )) strcatW( path, slashW ); + strcatW (path, starW); } } else { /* Special case wildcard search with no extension (ie parameters ending in '.') as diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index e5a0138..c135621 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -148,6 +148,11 @@ static inline WCHAR *heap_strdupW(const WCHAR *str) return ret; } +static inline BOOL ends_with_backslash( const WCHAR *path ) +{ + return path[0] && path[strlenW(path) - 1] == '\\'; +} + /* Data structure to hold context when executing batch files */ typedef struct _BATCH_CONTEXT {

1 0