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

Alexandre Julliard : wine_release: Use groff to convert man pages to html.
by Alexandre Julliard June 28, 2013

June 28, 2013

Module: tools Branch: master Commit: aed344165c25f2d0b9af6b3a7930ef8639cb5c3a URL: http://source.winehq.org/git/tools.git/?a=commit;h=aed344165c25f2d0b9af6b3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 28 20:42:07 2013 +0200 wine_release: Use groff to convert man pages to html. --- wine_release | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/wine_release b/wine_release index 2c83621..32d245a 100755 --- a/wine_release +++ b/wine_release @@ -79,7 +79,7 @@ then do name=`basename $f .man` make -s -C `dirname $f` $name.man - nroff -man $f | ../bin/man2html --pgsize=100000 | $tools_dir/html2template -o $name.template && mv -f $name.template $templates_dir/en/docs/$name.template + groff -man -T html -P -l -k -K utf8 $f | $tools_dir/html2template -o $name.template && mv -f $name.template $templates_dir/en/docs/$name.template done make -s htmlpages && rm -rf ../WineAPI && mv documentation/html ../WineAPI

1 0

Jacek Caban : mshtml: Don' t declare empty interface for nsCycleCollectionISupports.
by Alexandre Julliard June 27, 2013

June 27, 2013

Module: wine Branch: master Commit: b3317c5bec951e0bf06a2986b3bb63d84fe86514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3317c5bec951e0bf06a2986b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 27 13:21:48 2013 +0200 mshtml: Don't declare empty interface for nsCycleCollectionISupports. --- dlls/mshtml/nsiface.idl | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 0e603d1..fcdf6f1 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3756,13 +3756,6 @@ interface nsIDocumentObserver : nsIMutationObserver [ object, - uuid(c61eac14-5f7a-4481-965e-7eaa6effa85f), - local -] -interface nsCycleCollectionISupports {} - -[ - object, uuid(3682dd99-8560-44f4-9b8f-ccce9d7b96fb), local ] @@ -3786,3 +3779,5 @@ interface nsIPluginInstance : nsISupports { nsresult GetDOMElement(nsIDOMElement **aDOMElement); } + +cpp_quote("DEFINE_GUID(IID_nsCycleCollectionISupports, 0xc61eac14,0x5f7a,0x4481,0x96,0x5e,0x7e,0xaa,0x6e,0xff,0xa8,0x5f);")

1 0

Alexandre Julliard : advapi32: Fix ReportEvent parameter types in the spec file.
by Alexandre Julliard June 27, 2013

June 27, 2013

Module: wine Branch: master Commit: cbe413187a798dcb0734b25ce30657f593d858b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbe413187a798dcb0734b25ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 18:47:59 2013 +0200 advapi32: Fix ReportEvent parameter types in the spec file. --- dlls/advapi32/advapi32.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 027d9d2..da3a42b 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -664,8 +664,8 @@ @ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) # @ stub RemoveTraceCallback # @ stub RemoveUsersFromEncryptedFile -@ stdcall ReportEventA (long long long long ptr long long str ptr) -@ stdcall ReportEventW (long long long long ptr long long wstr ptr) +@ stdcall ReportEventA(long long long long ptr long long ptr ptr) +@ stdcall ReportEventW(long long long long ptr long long ptr ptr) @ stdcall RevertToSelf() @ stdcall SaferCloseLevel(ptr) @ stdcall SaferComputeTokenFromLevel(ptr ptr ptr long ptr)

1 0

Alexandre Julliard : user32: Fetch the window menu again after sending initialization messages.
by Alexandre Julliard June 27, 2013

June 27, 2013

Module: wine Branch: master Commit: cd4d71e4a27e4b9b7d3717f7d2d764aaed5bff4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4d71e4a27e4b9b7d3717f7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 17:48:30 2013 +0200 user32: Fetch the window menu again after sending initialization messages. --- dlls/user32/menu.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index ae5cb36..f39ae7c 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3356,6 +3356,9 @@ void MENU_TrackMouseMenuBar( HWND hWnd, INT ht, POINT pt ) if (IsMenu(hMenu)) { MENU_InitTracking( hWnd, hMenu, FALSE, wFlags ); + + /* fetch the window menu again, it may have changed */ + hMenu = (ht == HTSYSMENU) ? get_win_sys_menu( hWnd ) : GetMenu( hWnd ); MENU_TrackMenu( hMenu, wFlags, pt.x, pt.y, hWnd, NULL ); MENU_ExitTracking(hWnd, FALSE); } @@ -3396,6 +3399,9 @@ void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar) MENU_InitTracking( hwnd, hTrackMenu, FALSE, wFlags ); + /* fetch the window menu again, it may have changed */ + hTrackMenu = (wParam & HTSYSMENU) ? get_win_sys_menu( hwnd ) : GetMenu( hwnd ); + if( wChar && wChar != ' ' ) { uItem = MENU_FindItemByKey( hwnd, hTrackMenu, wChar, (wParam & HTSYSMENU) );

1 0

Jacek Caban : oleaut32/tests: Added external connections tests for MSHLFLAGS_TABLEWEAK marshaling.
by Alexandre Julliard June 27, 2013

June 27, 2013

Module: wine Branch: master Commit: a87f401e7fd327b4bb3514c506d8e33febdcb037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a87f401e7fd327b4bb3514c50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 27 13:08:07 2013 +0200 oleaut32/tests: Added external connections tests for MSHLFLAGS_TABLEWEAK marshaling. --- dlls/oleaut32/tests/tmarshal.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 3572bbb..e4019bd 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1904,6 +1904,24 @@ static void test_external_connection(void) ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); ok(external_connections == 0, "external_connections = %d\n", external_connections); + /* Weak table marshaling does not increment external connections */ + hres = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hres); + + hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_TABLEWEAK); + ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); + ok(external_connections == 0, "external_connections = %d\n", external_connections); + + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + hres = CoUnmarshalInterface(stream, &IID_ItestDual, (void**)&iface); + ok(hres == S_OK, "CoUnmarshalInterface failed: %08x\n", hres); + ok(external_connections == 0, "external_connections = %d\n", external_connections); + ItestDual_Release(iface); + + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + hres = CoReleaseMarshalData(stream); + ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); + ok(external_connections == 0, "external_connections = %d\n", external_connections); } START_TEST(tmarshal)

1 0

Qian Hong : include: Added missing declaration for some msctf APIs.
by Alexandre Julliard June 27, 2013

June 27, 2013

Module: wine Branch: master Commit: 3ede5fdf3d8a15726964fa72d846f1a748917d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ede5fdf3d8a15726964fa72d… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed Jun 26 14:29:39 2013 +0800 include: Added missing declaration for some msctf APIs. --- include/msctf.idl | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index a67dbc1..e17132b 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -29,10 +29,14 @@ cpp_quote("#define TF_E_DISCONNECTED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_IT cpp_quote("#define TF_E_ALREADY_EXISTS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0506)") cpp_quote("#define TF_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201)") +cpp_quote("HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope);") +cpp_quote("HRESULT WINAPI SetInputScopes(HWND hwnd, const INT *pInputScopes, UINT cInputScopes, WCHAR **ppszPhraseList, UINT cPhrases, WCHAR *pszRegExp, WCHAR *pszSRGS);") cpp_quote("HRESULT WINAPI TF_CreateThreadMgr(ITfThreadMgr **pptim);") cpp_quote("HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim);") cpp_quote("HRESULT WINAPI TF_CreateInputProcessorProfiles(ITfInputProcessorProfiles **ppipr);") cpp_quote("HRESULT WINAPI TF_CreateLangBarMgr(ITfLangBarMgr **pppbm);") +cpp_quote("HRESULT WINAPI TF_CreateLangBarItemMgr(ITfLangBarItemMgr **pplbim);") +cpp_quote("HRESULT WINAPI TF_InvalidAssemblyListCacheIfExist(void);") cpp_quote("EXTERN_C const GUID GUID_PROP_TEXTOWNER;") cpp_quote("DEFINE_GUID(GUID_PROP_ATTRIBUTE,0x34b45670,0x7526,0x11d2,0xa1,0x47,0x00,0x10,0x5a,0x27,0x99,0xb5);")

1 0

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard June 27, 2013

June 27, 2013

Module: wine Branch: master Commit: cf22832efce7ebc260d3712288dc983d5850c388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf22832efce7ebc260d371228… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jun 26 21:24:23 2013 -0300 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 6ad9576..05789e9 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8970,7 +8970,7 @@ msgid "" "The time formats of the \"song pointer\" and SMPTE are mutually exclusive. " "You can't use them together." msgstr "" -"O formato de hora do \"song pointer\" e SMPTE são mutualmente exclusivos. " +"O formato de hora do \"song pointer\" e SMPTE são mutuamente exclusivos. " "Você não pode utilizá-los juntos." #: winmm.rc:124 @@ -9411,11 +9411,11 @@ msgid "" "CD <dir> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "" -"CD <dir> é a abreviação de CHDIR. Ela altera o atual diretório padrão.\n" +"CD <dir> é a abreviação de CHDIR. Ele altera o diretório padrão atual.\n" #: cmd.rc:41 msgid "CHDIR <dir> changes the current default directory.\n" -msgstr "CHDIR <dir> altera o atual diretório padrão.\n" +msgstr "CHDIR <dir> altera o diretório padrão atual.\n" #: cmd.rc:43 msgid "CLS clears the console screen.\n" @@ -14405,9 +14405,9 @@ msgstr "" "[/Y] Omite alertas ao sobrescrever arquivos.\n" "[/-Y] Alerta ao sobrescrever arquivos.\n" "[/P] Alerta antes de cada arquivo ser copiado.\n" -"[/N] Copiar usando nomes pequenos.\n" +"[/N] Copiar usando nomes curtos.\n" "[/U] Copiar apenas arquivos que já existem no destino.\n" -"[/R] Sobrescrever quaisquer arquivos de somente leitura.\n" +"[/R] Sobrescrever quaisquer arquivos somente leitura.\n" "[/H] Incluir arquivos ocultos e de sistema na cópia.\n" "[/C] Continuar mesmo que ocorra um erro durante a cópia.\n" "[/A] Copiar apenas arquivos com atributo de arquivo.\n"

1 0

André Hentschel : oleaut32/tests: Don' t use autoheader styled defines in safearray.
by Alexandre Julliard June 27, 2013

June 27, 2013

Module: wine Branch: master Commit: 38f16107d68b8ac2952ad1cb4ef4fcaff4c60b20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38f16107d68b8ac2952ad1cb4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 26 23:47:57 2013 +0200 oleaut32/tests: Don't use autoheader styled defines in safearray. --- dlls/oleaut32/tests/safearray.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 8acca13..289640b 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -52,13 +52,10 @@ static SAFEARRAY* (WINAPI *pSafeArrayCreateVector)(VARTYPE,LONG,ULONG); #define GETPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func) -/* Is a given function exported from oleaut32? */ -#define HAVE_FUNC(func) ((void*)GetProcAddress(hOleaut32, #func) != NULL) - -/* Have I8/UI8 data type? */ -#define HAVE_OLEAUT32_I8 HAVE_FUNC(VarI8FromI1) -/* Have INT_PTR/UINT_PTR type? */ -static BOOL HAVE_OLEAUT32_INT_PTR; +/* Has I8/UI8 data type? */ +static BOOL has_i8; +/* Has INT_PTR/UINT_PTR type? */ +static BOOL has_int_ptr; #define START_REF_COUNT 1 #define RECORD_SIZE 64 @@ -179,14 +176,14 @@ static DWORD SAFEARRAY_GetVTSize(VARTYPE vt) case VT_R8: return sizeof(LONG64); case VT_I8: case VT_UI8: - if (HAVE_OLEAUT32_I8) + if (has_i8) return sizeof(LONG64); break; case VT_INT: case VT_UINT: return sizeof(INT); case VT_INT_PTR: case VT_UINT_PTR: - if (HAVE_OLEAUT32_INT_PTR) + if (has_int_ptr) return sizeof(UINT_PTR); break; case VT_CY: return sizeof(CY); @@ -212,13 +209,13 @@ static void check_for_VT_INT_PTR(void) if (a) { HRESULT hres; trace("VT_INT_PTR is supported\n"); - HAVE_OLEAUT32_INT_PTR = TRUE; + has_int_ptr = TRUE; hres = SafeArrayDestroy(a); ok(hres == S_OK, "got 0x%08x\n", hres); } else { trace("VT_INT_PTR is not supported\n"); - HAVE_OLEAUT32_INT_PTR = FALSE; + has_int_ptr = FALSE; } } @@ -459,7 +456,7 @@ static void test_safearray(void) ok(hres == S_OK,"SAD failed with hres %x\n", hres); for (i=0;i<sizeof(vttypes)/sizeof(vttypes[0]);i++) { - if ((i == VT_I8 || i == VT_UI8) && HAVE_OLEAUT32_I8) + if ((i == VT_I8 || i == VT_UI8) && has_i8) { vttypes[i].elemsize = sizeof(LONG64); } @@ -1786,6 +1783,8 @@ START_TEST(safearray) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); + has_i8 = GetProcAddress(hOleaut32, "VarI8FromI1") != NULL; + GETPTR(SafeArrayAllocDescriptorEx); GETPTR(SafeArrayCopyData); GETPTR(SafeArrayGetIID);

1 0

André Hentschel : oleaut32/tests: Get rid of HAVE_OLEAUT32_RECORD in safearray.
by Alexandre Julliard June 27, 2013

June 27, 2013

Module: wine Branch: master Commit: cdeae41cd13e3dc5702bc91e8f027dc4587642db URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdeae41cd13e3dc5702bc91e8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 26 23:44:34 2013 +0200 oleaut32/tests: Get rid of HAVE_OLEAUT32_RECORD in safearray. --- dlls/oleaut32/tests/safearray.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index d434ae8..c6d16ce 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -55,8 +55,6 @@ static SAFEARRAY* (WINAPI *pSafeArrayCreateVector)(VARTYPE,LONG,ULONG); /* Is a given function exported from oleaut32? */ #define HAVE_FUNC(func) ((void*)GetProcAddress(hOleaut32, #func) != NULL) -/* Have IRecordInfo data type? */ -#define HAVE_OLEAUT32_RECORD HAVE_FUNC(SafeArraySetRecordInfo) /* Have R8 data type? */ #define HAVE_OLEAUT32_R8 HAVE_FUNC(VarR8FromI1) /* Have I8/UI8 data type? */ @@ -484,8 +482,6 @@ static void test_safearray(void) if (a) { - if (!HAVE_OLEAUT32_RECORD) - vttypes[i].expflags = 0; ok(a->fFeatures == (vttypes[i].expflags | vttypes[i].addflags), "SAC of %d returned feature flags %x, expected %x\n", vttypes[i].vt, a->fFeatures,

1 0

Austin English : winex11.drv: Print the architecture when showing driver problems.
by Alexandre Julliard June 27, 2013

June 27, 2013

Module: wine Branch: master Commit: 44e69805e9d328b1ae7899584500393f8a8f8881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44e69805e9d328b1ae7899584… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 25 18:52:02 2013 -0700 winex11.drv: Print the architecture when showing driver problems. --- dlls/winex11.drv/opengl.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index cd24575..0f937cb 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -282,6 +282,8 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION context_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static const BOOL is_win64 = sizeof(void *) > sizeof(int); + static struct opengl_funcs opengl_funcs; #define USE_GL_FUNC(name) #name, @@ -464,7 +466,8 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) if(pglXMakeCurrent(gdi_display, win, ctx) == 0) { - ERR_(winediag)( "Unable to activate OpenGL context, most likely your OpenGL drivers haven't been installed correctly\n" ); + ERR_(winediag)( "Unable to activate OpenGL context, most likely your %s OpenGL drivers haven't been " + "installed correctly\n", is_win64 ? "64-bit" : "32-bit" ); goto done; } gl_renderer = (const char *)opengl_funcs.gl.p_glGetString(GL_RENDERER); @@ -506,9 +509,10 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) * Detect a local X11 server by checking whether the X11 socket is a Unix socket. */ if(!getsockname(fd, (struct sockaddr *)&uaddr, &uaddrlen) && uaddr.sun_family == AF_UNIX) - ERR_(winediag)("Direct rendering is disabled, most likely your OpenGL drivers " + ERR_(winediag)("Direct rendering is disabled, most likely your %s OpenGL drivers " "haven't been installed correctly (using GL renderer %s, version %s).\n", - debugstr_a(gl_renderer), debugstr_a(WineGLInfo.glVersion)); + is_win64 ? "64-bit" : "32-bit", debugstr_a(gl_renderer), + debugstr_a(WineGLInfo.glVersion)); } else { @@ -522,9 +526,10 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) * it shows 'Mesa X11'. */ if(!strcmp(gl_renderer, "Software Rasterizer") || !strcmp(gl_renderer, "Mesa X11")) - ERR_(winediag)("The Mesa OpenGL driver is using software rendering, most likely your OpenGL " + ERR_(winediag)("The Mesa OpenGL driver is using software rendering, most likely your %s OpenGL " "drivers haven't been installed correctly (using GL renderer %s, version %s).\n", - debugstr_a(gl_renderer), debugstr_a(WineGLInfo.glVersion)); + is_win64 ? "64-bit" : "32-bit", debugstr_a(gl_renderer), + debugstr_a(WineGLInfo.glVersion)); } ret = TRUE;

1 0