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

Paul Vriens : winecfg: Update Dutch resource.
by Alexandre Julliard April 13, 2006

April 13, 2006

Module: wine Branch: refs/heads/master Commit: 346aa7a3fe5495a150e527b87e2f077b6cec7b6c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=346aa7a3fe5495a150e527b… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Apr 13 11:05:34 2006 +0200 winecfg: Update Dutch resource. --- programs/winecfg/Nl.rc | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index 6aefbb6..a2f1858 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -168,7 +168,11 @@ BEGIN GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Hardwareversnelling: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Stuurprogramma emulatie",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 + LTEXT "Monsterfrequentie:",IDC_STATIC,15,232,70,8 + COMBOBOX IDC_DSOUND_RATES,90,230,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Bits per monster:",IDC_STATIC,157,232,60,8 + COMBOBOX IDC_DSOUND_BITS,220,230,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Stuurprogramma emulatie",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,250,230,10 END IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250

1 0

docs/en wine-faq.sgml
by Alexandre Julliard April 13, 2006

April 13, 2006

ChangeSet ID: 1144925279699387943212972 CVSROOT: /cvsroot/wine Module name: docs Changes by: ajulliard(a)sc8-pr-cvs1.sourceforge.net 2006/04/13 03:47:59 Modified files: en : wine-faq.sgml Log message: Fixed a typo in a closing tag. Old revision New revision Changes Path 1.16 1.17 +1 -1 docs/en/wine-faq.sgml Index: docs/en/wine-faq.sgml diff -u -p docs/en/wine-faq.sgml:1.16 docs/en/wine-faq.sgml:1.17 --- docs/en/wine-faq.sgml 13 Apr 2006 10:47:59 -0000 +++ /dev/null 13 Apr 2006 10:47:59 -0000 @@ -634,7 +634,7 @@ cvs -z3 -d:pserver:anonymous(a)cvs.sourcef reimplementation in order to be functional. </para> </answer> - </qanaentry> + </qandaentry> <qandaentry> <question id="What-minimum-CPU-must-I-have"> <para>

1 0

Alexandre Julliard : advpack: Fixed a couple of typos in Unicode conversion .
by Alexandre Julliard April 13, 2006

April 13, 2006

Module: wine Branch: refs/heads/master Commit: 5c2a980c86062a9dd5c0d1b2eeda4d367d828d83 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c2a980c86062a9dd5c0d1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 13 12:10:56 2006 +0200 advpack: Fixed a couple of typos in Unicode conversion. --- dlls/advpack/reg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index 9e87dcb..13911ce 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -102,13 +102,13 @@ static void strentry_atow(STRENTRYA *aen DWORD name_len, val_len; name_len = MultiByteToWideChar(CP_ACP, 0, aentry->pszName, -1, NULL, 0); - val_len = MultiByteToWideChar(CP_ACP, 0, aentry->pszName, -1, NULL, 0); + val_len = MultiByteToWideChar(CP_ACP, 0, aentry->pszValue, -1, NULL, 0); wentry->pszName = HeapAlloc(GetProcessHeap(), 0, name_len * sizeof(WCHAR)); wentry->pszValue = HeapAlloc(GetProcessHeap(), 0, val_len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, aentry->pszName, -1, wentry->pszName, name_len); - MultiByteToWideChar(CP_ACP, 0, aentry->pszName, -1, wentry->pszValue, val_len); + MultiByteToWideChar(CP_ACP, 0, aentry->pszValue, -1, wentry->pszValue, val_len); } static STRTABLEW *strtable_atow(const STRTABLEA *atable)

1 0

Alexandre Julliard : crypt32: Fixed day/ month mismatch in time encoding routines.
by Alexandre Julliard April 13, 2006

April 13, 2006

Module: wine Branch: refs/heads/master Commit: 4d574a41b59b97ba88f35e77c15531b4e60cae7e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d574a41b59b97ba88f35e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 13 11:45:12 2006 +0200 crypt32: Fixed day/month mismatch in time encoding routines. --- dlls/crypt32/encode.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index d04f747..0025590 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1957,7 +1957,7 @@ static BOOL WINAPI CRYPT_AsnEncodeUtcTim snprintf(buf + 2, sizeof(buf) - 2, "%02d%02d%02d%02d%02d%02dZ", sysTime.wYear >= 2000 ? sysTime.wYear - 2000 : sysTime.wYear - 1900, - sysTime.wDay, sysTime.wMonth, sysTime.wHour, + sysTime.wMonth, sysTime.wDay, sysTime.wHour, sysTime.wMinute, sysTime.wSecond); memcpy(pbEncoded, buf, bytesNeeded); } @@ -2007,7 +2007,7 @@ static BOOL WINAPI CRYPT_AsnEncodeGenera buf[0] = ASN_GENERALTIME; buf[1] = bytesNeeded - 2; snprintf(buf + 2, sizeof(buf) - 2, "%04d%02d%02d%02d%02d%02dZ", - sysTime.wYear, sysTime.wDay, sysTime.wMonth, sysTime.wHour, + sysTime.wYear, sysTime.wMonth, sysTime.wDay, sysTime.wHour, sysTime.wMinute, sysTime.wSecond); memcpy(pbEncoded, buf, bytesNeeded); }

1 0

Alexandre Julliard : crypt32: Avoid crash on NULL pointer in trace.
by Alexandre Julliard April 13, 2006

April 13, 2006

Module: wine Branch: refs/heads/master Commit: ee05e245a42a557a6deec5c66d24fefac4684acd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee05e245a42a557a6deec5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 13 11:44:52 2006 +0200 crypt32: Avoid crash on NULL pointer in trace. --- dlls/crypt32/cert.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 9269cb7..f44cc63 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -323,14 +323,14 @@ BOOL WINAPI CertGetEnhancedKeyUsage(PCCE DWORD bytesNeeded; BOOL ret = TRUE; - TRACE("(%p, %08lx, %p, %ld)\n", pCertContext, dwFlags, pUsage, *pcbUsage); - if (!pCertContext || !pcbUsage) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + TRACE("(%p, %08lx, %p, %ld)\n", pCertContext, dwFlags, pUsage, *pcbUsage); + if (!(dwFlags & CERT_FIND_EXT_ONLY_ENHKEY_USAGE_FLAG)) { DWORD propSize = 0;

1 0

Rein Klazes : user: Fix dereferencing a potential NULL pointer.
by Alexandre Julliard April 13, 2006

April 13, 2006

Module: wine Branch: refs/heads/master Commit: 7a560493fe0e6aa31705d3d751072b5dc62914a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a560493fe0e6aa31705d3d… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Sat Apr 8 12:48:13 2006 +0200 user: Fix dereferencing a potential NULL pointer. --- dlls/user/menu.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index 897b5d8..a487347 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -1693,23 +1693,23 @@ static void MENU_DrawPopupMenu( HWND hwn else DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT); - menu = MENU_GetMenu( hmenu ); - - /* draw menu items */ - if (menu && menu->nItems) - { - MENUITEM *item; - UINT u; - - for (u = menu->nItems, item = menu->items; u > 0; u--, item++) - MENU_DrawMenuItem( hwnd, hmenu, menu->hwndOwner, hdc, item, - menu->Height, FALSE, ODA_DRAWENTIRE ); - - } + if( (menu = MENU_GetMenu( hmenu ))) + { + /* draw menu items */ + if( menu->nItems) + { + MENUITEM *item; + UINT u; - /* draw scroll arrows */ - if (menu->bScrolling) - MENU_DrawScrollArrows(menu, hdc); + item = menu->items; + for( u = menu->nItems; u > 0; u--, item++) + MENU_DrawMenuItem( hwnd, hmenu, menu->hwndOwner, hdc, + item, menu->Height, FALSE, ODA_DRAWENTIRE ); + } + /* draw scroll arrows */ + if (menu->bScrolling) + MENU_DrawScrollArrows(menu, hdc); + } } else { SelectObject( hdc, hPrevBrush );

1 0

Jason Green : wined3d: Add case 0 to switch statement and fix the fixme.
by Alexandre Julliard April 13, 2006

April 13, 2006

Module: wine Branch: refs/heads/master Commit: 5f4b424553fda6a1dd0ff33db04411a287b5f13c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f4b424553fda6a1dd0ff33… Author: Jason Green <jave27(a)gmail.com> Date: Wed Apr 12 19:42:55 2006 -0400 wined3d: Add case 0 to switch statement and fix the fixme. Screwed up a copy/paste from one of my recent patches. This eliminates the erroneous FIXME for calls to D3DFmtMakeGlCfg() with 0 as the Stencil format. Also, it changes the FIXME to print the correct variable. --- dlls/wined3d/utils.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1b77b5b..b38db42 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1948,6 +1948,9 @@ int D3DFmtMakeGlCfg(D3DFORMAT BackBuffer } if(!alternate){ switch (StencilBufferFormat) { + case 0: + break; + case WINED3DFMT_D16_LOCKABLE: case WINED3DFMT_D16: PUSH2(GLX_DEPTH_SIZE, 16); @@ -1984,12 +1987,15 @@ int D3DFmtMakeGlCfg(D3DFORMAT BackBuffer break; default: - FIXME("Unsupported stencil format: %s\n", debug_d3dformat(BackBufferFormat)); + FIXME("Unsupported stencil format: %s\n", debug_d3dformat(StencilBufferFormat)); break; } } else { /* it the device doesn't support the 'exact' format, try to find something close */ switch (StencilBufferFormat) { + case 0: + break; + case WINED3DFMT_D16_LOCKABLE: case WINED3DFMT_D16: PUSH2(GLX_DEPTH_SIZE, 1); @@ -2026,7 +2032,7 @@ int D3DFmtMakeGlCfg(D3DFORMAT BackBuffer break; default: - FIXME("Unsupported stencil format: %s\n", debug_d3dformat(BackBufferFormat)); + FIXME("Unsupported stencil format: %s\n", debug_d3dformat(StencilBufferFormat)); break; } }

1 0

Paul Vriens : version: Translate some German comments.
by Alexandre Julliard April 13, 2006

April 13, 2006

Module: wine Branch: refs/heads/master Commit: b3d8be24dbcb90bd78595f2b24618210a5ccfa3b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b3d8be24dbcb90bd78595f2… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Apr 13 10:16:37 2006 +0200 version: Translate some German comments. --- dlls/version/install.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/version/install.c b/dlls/version/install.c index 60b0315..0675cd2 100644 --- a/dlls/version/install.c +++ b/dlls/version/install.c @@ -473,8 +473,8 @@ DWORD WINAPI VerInstallFileA( if (VerQueryValueA(buf1,"\\VarFileInfo\\Translation",(LPVOID*)&tbuf1,&len1) && VerQueryValueA(buf2,"\\VarFileInfo\\Translation",(LPVOID*)&tbuf2,&len2) ) { - /* irgendwas mit tbuf1 und tbuf2 machen - * generiert DIFFLANG|MISMATCH + /* Do something with tbuf1 and tbuf2 + * generates DIFFLANG|MISMATCH */ } HeapFree(GetProcessHeap(), 0, buf2);

1 0

Jeff Latimer : usp10: Add some tests to ScriptGetFontProperties.
by Alexandre Julliard April 13, 2006

April 13, 2006

Module: wine Branch: refs/heads/master Commit: ca55584b1967c1d36b1b59ca7aafa97bcbbe3107 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca55584b1967c1d36b1b59c… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Thu Apr 13 18:38:31 2006 +1000 usp10: Add some tests to ScriptGetFontProperties. --- dlls/usp10/usp10.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 030498f..b0e7ce8 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -124,10 +124,31 @@ HRESULT WINAPI ScriptGetProperties(const */ HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPROPERTIES *sfp) { + HDC phdc; + Scriptcache *pScriptcache; + FIXME("%p,%p,%p\n", hdc, psc, sfp); + if (!hdc && !*psc) { + TRACE("No Script_Cache (psc) and no hdc. Ask for one. Hdc=%p, psc=%p\n", hdc, *psc); + return E_PENDING; + } else + if (hdc && !*psc) { + pScriptcache = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(Scriptcache) ); + pScriptcache->hdc = (HDC) hdc; + phdc = hdc; + pScriptcache->HaveWidths = 0; + *psc = (Scriptcache *) pScriptcache; + } else + if (*psc) { + pScriptcache = (Scriptcache *) *psc; + phdc = pScriptcache->hdc; + } + + if (sfp->cBytes != sizeof(SCRIPT_FONTPROPERTIES)) + return E_INVALIDARG; + /* return something sensible? */ if (NULL != sfp) { - sfp->cBytes = sizeof(SCRIPT_FONTPROPERTIES); sfp->wgBlank = 0; sfp->wgDefault = 0; sfp->wgInvalid = 0; @@ -431,10 +452,6 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRI * ScriptGetCMap (USP10.@) * */ -/*********************************************************************** - * ScriptGetCMap (USP10.@) - * - */ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars, int cChars, DWORD dwFlags, WORD *pwOutGlyphs) {

1 0

qingdoa daoo : msvcrt: If caller passes a NULL deallocator to __unDNameEx, don't use it.
by Alexandre Julliard April 13, 2006

April 13, 2006

Module: wine Branch: refs/heads/master Commit: 750102d1a3a254bdf3fa3f21f3ab2812be9a134b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=750102d1a3a254bdf3fa3f2… Author: qingdoa daoo <qingdao33122(a)yahoo.com> Date: Thu Apr 13 00:12:50 2006 -0700 msvcrt: If caller passes a NULL deallocator to __unDNameEx, don't use it. --- dlls/msvcrt/undname.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index ebf51fa..d18c663 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -161,7 +161,7 @@ static void und_free_all(struct parsed_s while (sym->alloc_list) { next = *(void**)sym->alloc_list; - sym->mem_free_ptr(sym->alloc_list); + if(sym->mem_free_ptr) sym->mem_free_ptr(sym->alloc_list); sym->alloc_list = next; } sym->avail_in_first = 0;

1 0