June 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : configure: Add a wrapper macro for . cfi pseudo-ops in assembly code.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: e1f0a0db1fb4c98eac66c626791e0058d012182b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f0a0db1fb4c98eac66c6267… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 11:49:21 2009 +0200 configure: Add a wrapper macro for .cfi pseudo-ops in assembly code. --- configure | 10 ++++++++++ configure.ac | 3 +++ include/config.h.in | 3 +++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2b759b7..3f3548e 100755 --- a/configure +++ b/configure @@ -18207,6 +18207,16 @@ if test "$ac_cv_c_cfi_support" = "yes" then asm_func_header="$asm_func_header.cfi_startproc\\n\\t" asm_func_trailer="\\n\\t.cfi_endproc$asm_func_trailer" + +cat >>confdefs.h <<\_ACEOF +#define __ASM_CFI(str) str +_ACEOF + +else + cat >>confdefs.h <<\_ACEOF +#define __ASM_CFI(str) "" +_ACEOF + fi asm_func_code="$asm_func_header\" code \"$asm_func_trailer" diff --git a/configure.ac b/configure.ac index eb276b6..bb4d82e 100644 --- a/configure.ac +++ b/configure.ac @@ -1519,6 +1519,9 @@ if test "$ac_cv_c_cfi_support" = "yes" then asm_func_header="$asm_func_header.cfi_startproc\\n\\t" asm_func_trailer="\\n\\t.cfi_endproc$asm_func_trailer" + AC_DEFINE([__ASM_CFI(str)],[str],[Define to a macro to output a .cfi assembly pseudo-op]) +else + AC_DEFINE([__ASM_CFI(str)],[""]) fi asm_func_code="$asm_func_header\" code \"$asm_func_trailer" diff --git a/include/config.h.in b/include/config.h.in index 99ecae3..f6799c6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1188,6 +1188,9 @@ /* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING +/* Define to a macro to output a .cfi assembly pseudo-op */ +#undef __ASM_CFI + /* Define to a macro to define an assembly function */ #undef __ASM_DEFINE_FUNC

1 0

André Hentschel : taskmgr: Update German translation.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 0760cacdcbc906a3da59fbe538439072354f8a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0760cacdcbc906a3da59fbe53… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 24 18:29:03 2009 +0200 taskmgr: Update German translation. --- programs/taskmgr/De.rc | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/programs/taskmgr/De.rc b/programs/taskmgr/De.rc index a31ca6b..7b13747 100644 --- a/programs/taskmgr/De.rc +++ b/programs/taskmgr/De.rc @@ -488,3 +488,32 @@ BEGIN IDS_STATUS_BAR_PROCESSES "Prozesse: %d" IDS_STATUS_BAR_MEMORY_USAGE "Speicherauslastung: %dK / %dK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMAGENAME "Name" + IDS_PID "PID (Prozess-ID)" + IDS_CPUUSAGE "CPU-Auslastung" + IDS_CPUTIME "CPU-Zeit" + IDS_MEMORYUSAGE "Speicherauslastung" + IDS_MEMORYUSAGEDELTA "Ver�nd. der Speicherauslastung" + IDS_PEAKMEMORYUSAGE "Maximale Speicherauslastung" + IDS_PAGEFAULTS "Seitenfehler" + IDS_USEROBJECTS "Benutzer-Objekte" + IDS_IOREADS "E/A (Lesen)" + IDS_IOREADBYTES "E/A-Bytes (Lesen)" + IDS_SESSIONID "Sitzungs-ID" + IDS_USERNAME "Benutzername" + IDS_PAGEFAULTSDELTA "Ver�nd. der Seiten" + IDS_VIRTUALMEMORYSIZE "Gr��e des virt. Speichers" + IDS_PAGEDPOOL "Ausgelagerter Pool" + IDS_NONPAGEDPOOL "Nichtausgelagerter Pool" + IDS_BASEPRIORITY "Basispriorit�t" + IDS_HANDLECOUNT "Handle-Anzahl" + IDS_THREADCOUNT "Thread-Anzahl" + IDS_GDIOBJECTS "GDI-Objekte" + IDS_IOWRITES "E/A (Schreiben)" + IDS_IOWRITEBYTES "E/A-Bytes (Schreiben)" + IDS_IOOTHER "E/A (Andere)" + IDS_IOOTHERBYTES "E/A-Bytes (Andere)" +END

1 0

Alexandre Julliard : dbghelp: Fix detection of special Wine segments.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: a5231a60a1a4843fb26f6a2c5e94d0c5808f8ab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5231a60a1a4843fb26f6a2c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 11:45:08 2009 +0200 dbghelp: Fix detection of special Wine segments. --- dlls/dbghelp/macho_module.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index c0458c6..4210d1f 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -390,9 +390,7 @@ static int macho_accum_segs_range(struct macho_file_map* fmap, TRACE("Segment command vm: 0x%08x - 0x%08x\n", (unsigned)sc->vmaddr, (unsigned)sc->vmaddr + sc->vmsize); - if (!strncmp(sc->segname, "WINE_DOS", sizeof(sc->segname)) || - !strncmp(sc->segname, "WINE_OLE32", sizeof(sc->segname)) || - !strncmp(sc->segname, "WINE_SHARED_HEAP", sizeof(sc->segname))) + if (!strncmp(sc->segname, "WINE_", 5)) { TRACE("Ignoring special Wine segment %s\n", debugstr_an(sc->segname, sizeof(sc->segname))); return 0;

1 0

Austin English : winedbg: Return 0 if --help is specified.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 7f13b126d5da366dd2d854ba342850ddb880e6db URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f13b126d5da366dd2d854ba3… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jun 24 21:35:21 2009 -0500 winedbg: Return 0 if --help is specified. --- programs/winedbg/winedbg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index a75e548..5584148 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -587,7 +587,7 @@ static int dbg_winedbg_usage(BOOL advanced) } else dbg_printf("Usage:\n\twinedbg [ [ --gdb ] [ prog-name [ prog-args ] | <num> | file.mdmp | --help ]\n"); - return -1; + return 0; } void dbg_start_interactive(HANDLE hFile)

1 0

Damjan Jovanovic : winemenubuilder: Generate new menus in the right directory.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: d3bf447f1b8fd2bf8770ec2eb8c1249d1e3c0759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3bf447f1b8fd2bf8770ec2eb… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 25 07:19:07 2009 +0200 winemenubuilder: Generate new menus in the right directory. --- programs/winemenubuilder/winemenubuilder.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index cd3506b..fa74411 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -906,10 +906,10 @@ static BOOL write_menu_file(const char *unix_link, const char *filename) while (1) { - tempfilename = tempnam(xdg_config_dir, "_wine"); + tempfilename = heap_printf("%s/wine-menu-XXXXXX", xdg_config_dir); if (tempfilename) { - int tempfd = open(tempfilename, O_EXCL | O_CREAT | O_WRONLY, 0666); + int tempfd = mkstemps(tempfilename, 0); if (tempfd >= 0) { tempfile = fdopen(tempfd, "w"); @@ -920,10 +920,10 @@ static BOOL write_menu_file(const char *unix_link, const char *filename) } else if (errno == EEXIST) { - free(tempfilename); + HeapFree(GetProcessHeap(), 0, tempfilename); continue; } - free(tempfilename); + HeapFree(GetProcessHeap(), 0, tempfilename); } return FALSE; } @@ -981,7 +981,7 @@ end: ret = (rename(tempfilename, menuPath) == 0); if (!ret && tempfilename) remove(tempfilename); - free(tempfilename); + HeapFree(GetProcessHeap(), 0, tempfilename); if (ret) { HKEY hkey = open_menus_reg_key();

1 0

Aric Stewart : wintrust: GetSignedMsgFromCabFile looks for signinfo at the beginning of the cab.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: d962939290f407d925c12b2fb3f4d3cdd0d015da URL: http://source.winehq.org/git/wine.git/?a=commit;h=d962939290f407d925c12b2fb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 25 16:59:46 2009 +0900 wintrust: GetSignedMsgFromCabFile looks for signinfo at the beginning of the cab. Discussed with Juan Lang, We could look for the signinfo at the beginning of the cab and restore the file pointer afterward. This allows IE7 to read the signing information from downloaded ActiveX controls. --- dlls/wintrust/crypt.c | 35 ++++------------------------------- 1 files changed, 4 insertions(+), 31 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index e01a230..d9fa563 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -1121,36 +1121,6 @@ static BOOL WINTRUST_GetSignedMsgFromCabFile(SIP_SUBJECTINFO *pSubjectInfo, TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, pcbSignedDataMsg, pbSignedDataMsg); - /* - * FIXME: I just noticed that I am memorizing the initial file pointer - * offset and restoring it before reading in the rest of the header - * information in the cabinet. Perhaps that's correct -- that is, perhaps - * this API is supposed to support "streaming" cabinets which are embedded - * in other files, or cabinets which begin at file offsets other than zero. - * Otherwise, I should instead go to the absolute beginning of the file. - * (Either way, the semantics of wine's FDICopy require me to leave the - * file pointer where it is afterwards -- If Windows does not do so, we - * ought to duplicate the native behavior in the FDIIsCabinet API, not here. - * - * So, the answer lies in Windows; will native cabinet.dll recognize a - * cabinet "file" embedded in another file? Note that cabextract.c does - * support this, which implies that Microsoft's might. I haven't tried it - * yet so I don't know. ATM, most of wine's FDI cabinet routines (except - * this one) would not work in this way. To fix it, we could just make the - * various references to absolute file positions in the code relative to an - * initial "beginning" offset. Because the FDICopy API doesn't take a - * file-handle like this one, we would therein need to search through the - * file for the beginning of the cabinet (as we also do in cabextract.c). - * Note that this limits us to a maximum of one cabinet per. file: the first. - * - * So, in summary: either the code below is wrong, or the rest of fdi.c is - * wrong... I cannot imagine that both are correct ;) One of these flaws - * should be fixed after determining the behavior on Windows. We ought - * to check both FDIIsCabinet and FDICopy for the right behavior. - * - * -gmt - */ - /* get basic offset & size info */ base_offset = SetFilePointer(pSubjectInfo->hFile, 0L, NULL, SEEK_CUR); @@ -1162,7 +1132,7 @@ static BOOL WINTRUST_GetSignedMsgFromCabFile(SIP_SUBJECTINFO *pSubjectInfo, cabsize = SetFilePointer(pSubjectInfo->hFile, 0L, NULL, SEEK_CUR); if ((cabsize == -1) || (base_offset == -1) || - (SetFilePointer(pSubjectInfo->hFile, base_offset, NULL, SEEK_SET) == INVALID_SET_FILE_POINTER)) + (SetFilePointer(pSubjectInfo->hFile, 0, NULL, SEEK_SET) == INVALID_SET_FILE_POINTER)) { TRACE("seek error\n"); return FALSE; @@ -1267,6 +1237,7 @@ static BOOL WINTRUST_GetSignedMsgFromCabFile(SIP_SUBJECTINFO *pSubjectInfo, NULL) || dwRead != cert_size) { ERR("couldn't read cert\n"); + SetFilePointer(pSubjectInfo->hFile, base_offset, NULL, SEEK_SET); return FALSE; } /* The encoding of the files I've seen appears to be in ASN.1 @@ -1274,6 +1245,8 @@ static BOOL WINTRUST_GetSignedMsgFromCabFile(SIP_SUBJECTINFO *pSubjectInfo, * always is. */ *pdwEncodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; + /* Restore base offset */ + SetFilePointer(pSubjectInfo->hFile, base_offset, NULL, SEEK_SET); return TRUE; }

1 0

Aric Stewart : msctf: Correct registry key from "Enabled" to "Enable".
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: eb0ef77478cc15780c3f28074f2d06cfc4b4e3ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0ef77478cc15780c3f28074… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 25 17:00:06 2009 +0900 msctf: Correct registry key from "Enabled" to "Enable". --- dlls/msctf/inputprocessor.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index a904a68..80d8c7d 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctf); static const WCHAR szwLngp[] = {'L','a','n','g','u','a','g','e','P','r','o','f','i','l','e',0}; -static const WCHAR szwEnabled[] = {'E','n','a','b','l','e','d',0}; +static const WCHAR szwEnable[] = {'E','n','a','b','l','e',0}; static const WCHAR szwTipfmt[] = {'%','s','\\','%','s',0}; static const WCHAR szwFullLangfmt[] = {'%','s','\\','%','s','\\','%','s','\\','0','x','%','0','8','x','\\','%','s',0}; @@ -144,7 +144,7 @@ static void add_userkey( REFCLSID rclsid, LANGID langid, if (!res && disposition == REG_CREATED_NEW_KEY) { DWORD zero = 0x0; - RegSetValueExW(key, szwEnabled, 0, REG_DWORD, (LPBYTE)&zero, sizeof(DWORD)); + RegSetValueExW(key, szwEnable, 0, REG_DWORD, (LPBYTE)&zero, sizeof(DWORD)); } if (!res) @@ -278,7 +278,7 @@ static HRESULT WINAPI InputProcessorProfiles_AddLanguageProfile( RegSetValueExW(fmtkey, icnf, 0, REG_SZ, (LPBYTE)pchIconFile, cchFile * sizeof(WCHAR)); RegSetValueExW(fmtkey, icni, 0, REG_DWORD, (LPBYTE)&uIconIndex, sizeof(DWORD)); if (disposition == REG_CREATED_NEW_KEY) - RegSetValueExW(fmtkey, szwEnabled, 0, REG_DWORD, (LPBYTE)&zero, sizeof(DWORD)); + RegSetValueExW(fmtkey, szwEnable, 0, REG_DWORD, (LPBYTE)&zero, sizeof(DWORD)); RegCloseKey(fmtkey); add_userkey(rclsid, langid, guidProfile); @@ -456,7 +456,7 @@ static HRESULT WINAPI InputProcessorProfiles_EnableLanguageProfile( if (!res) { - RegSetValueExW(key, szwEnabled, 0, REG_DWORD, (LPBYTE)&fEnable, sizeof(DWORD)); + RegSetValueExW(key, szwEnable, 0, REG_DWORD, (LPBYTE)&fEnable, sizeof(DWORD)); RegCloseKey(key); } else @@ -490,7 +490,7 @@ static HRESULT WINAPI InputProcessorProfiles_IsEnabledLanguageProfile( if (!res) { DWORD count = sizeof(DWORD); - res = RegQueryValueExW(key, szwEnabled, 0, NULL, (LPBYTE)pfEnable, &count); + res = RegQueryValueExW(key, szwEnable, 0, NULL, (LPBYTE)pfEnable, &count); RegCloseKey(key); } @@ -501,7 +501,7 @@ static HRESULT WINAPI InputProcessorProfiles_IsEnabledLanguageProfile( if (!res) { DWORD count = sizeof(DWORD); - res = RegQueryValueExW(key, szwEnabled, 0, NULL, (LPBYTE)pfEnable, &count); + res = RegQueryValueExW(key, szwEnable, 0, NULL, (LPBYTE)pfEnable, &count); RegCloseKey(key); } } @@ -533,7 +533,7 @@ static HRESULT WINAPI InputProcessorProfiles_EnableLanguageProfileByDefault( if (!res) { - RegSetValueExW(key, szwEnabled, 0, REG_DWORD, (LPBYTE)&fEnable, sizeof(DWORD)); + RegSetValueExW(key, szwEnable, 0, REG_DWORD, (LPBYTE)&fEnable, sizeof(DWORD)); RegCloseKey(key); } else

1 0

Aric Stewart : msctf/tests: Release the ITfDocumentMgr received on GetFocus .
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 3fff6ec879e30a134d3a409dd78b2c6722a41c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fff6ec879e30a134d3a409dd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 25 17:00:22 2009 +0900 msctf/tests: Release the ITfDocumentMgr received on GetFocus. --- dlls/msctf/tests/inputprocessor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 4d94d3c..ba43570 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1170,6 +1170,7 @@ static void test_startSession(void) hr = ITfThreadMgr_GetFocus(g_tm,&dmtest); ok(SUCCEEDED(hr),"GetFocus Failed\n"); ok(g_dm == dmtest,"Expected DocumentMgr not focused\n"); + ITfDocumentMgr_Release(dmtest); TextStoreACP_Constructor((IUnknown**)&ts);

1 0

Aric Stewart : msctf: Semi-stub implementation of ITfInputProcessorProfiles ::GetLanguageList.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: a19efb7ad91a92934f40df8c6aa9554155e7eaaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19efb7ad91a92934f40df8c6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 25 17:00:45 2009 +0900 msctf: Semi-stub implementation of ITfInputProcessorProfiles::GetLanguageList. --- dlls/msctf/inputprocessor.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 80d8c7d..765c3d5 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -422,8 +422,11 @@ static HRESULT WINAPI InputProcessorProfiles_GetLanguageList( ITfInputProcessorProfiles *iface, LANGID **ppLangId, ULONG *pulCount) { InputProcessorProfiles *This = (InputProcessorProfiles*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + FIXME("Semi-STUB:(%p)\n",This); + *ppLangId = CoTaskMemAlloc(sizeof(LANGID)); + **ppLangId = This->currentLanguage; + *pulCount = 1; + return S_OK; } static HRESULT WINAPI InputProcessorProfiles_EnumLanguageProfiles(

1 0

Henri Verbeet : wined3d: Make sure we have an active GL context in delete_opengl_contexts().
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 11fd358cc6865dd5f9d305e284260894dfd2f76f URL: http://source.winehq.org/git/wine.git/?a=commit;h=11fd358cc6865dd5f9d305e28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 25 10:24:54 2009 +0200 wined3d: Make sure we have an active GL context in delete_opengl_contexts(). --- dlls/wined3d/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 04a453e..48d49a8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6971,6 +6971,8 @@ void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain_ UINT i; IWineD3DBaseShaderImpl *shader; + ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + IWineD3DDevice_EnumResources(iface, reset_unload_resources, NULL); LIST_FOR_EACH_ENTRY(shader, &This->shaders, IWineD3DBaseShaderImpl, baseShader.shader_list_entry) { This->shader_backend->shader_destroy((IWineD3DBaseShader *) shader);

1 0