October 2006 - Wine-Commits

Andrew Talbot : winecfg: Cast-qual warnings fix.
by Alexandre Julliard Oct. 7, 2006

Oct. 7, 2006

Module: wine Branch: master Commit: 91e3930c545f7ff2c6a0908a9652482e3bca25a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e3930c545f7ff2c6a0908a9… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Oct 6 21:41:22 2006 +0100 winecfg: Cast-qual warnings fix. --- programs/winecfg/appdefaults.c | 4 ++-- programs/winecfg/drive.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 91d80b9..d3fb6e3 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -123,12 +123,12 @@ init_comboboxes (HWND dialog) } } -static void add_listview_item(HWND listview, const WCHAR *text, void *association) +static void add_listview_item(HWND listview, WCHAR *text, void *association) { LVITEMW item; item.mask = LVIF_TEXT | LVIF_PARAM; - item.pszText = (WCHAR*) text; + item.pszText = text; item.cchTextMax = lstrlenW(text); item.lParam = (LPARAM) association; item.iItem = ListView_GetItemCount(listview); diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index 34fee36..36d7a1d 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -139,7 +139,7 @@ static void set_drive_type( char letter, else { if (typeText) - RegSetValueEx( hKey, driveValue, 0, REG_SZ, (LPBYTE)typeText, strlen(typeText) + 1 ); + RegSetValueEx( hKey, driveValue, 0, REG_SZ, (const BYTE *)typeText, strlen(typeText) + 1 ); else RegDeleteValue( hKey, driveValue ); RegCloseKey(hKey);

1 0

Alexandre Julliard : winex11.drv: Give XInitThreads another chance.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 0f8706ec33b3193f19b3a55247fe515497063fc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f8706ec33b3193f19b3a5524… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 6 17:56:51 2006 +0200 winex11.drv: Give XInitThreads another chance. --- dlls/winex11.drv/x11drv_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 0403b5d..95f9d10 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -383,6 +383,8 @@ static BOOL process_attach(void) /* Open display */ + if (!XInitThreads()) ERR( "XInitThreads failed, trouble ahead\n" ); + if (!(display = XOpenDisplay( NULL ))) return FALSE; fcntl( ConnectionNumber(display), F_SETFD, 1 ); /* set close on exec flag */

1 0

Hans Leidekker : winspool.drv: Cast-qual warnings fix.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: ab85b653f51730e427de2558e5349d3d12ffb690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab85b653f51730e427de2558e… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Oct 6 14:25:54 2006 +0200 winspool.drv: Cast-qual warnings fix. --- dlls/winspool.drv/info.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d340705..1cb3adc 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3727,7 +3727,7 @@ BOOL WINAPI EnumPrintersA(DWORD dwType, static BOOL WINSPOOL_GetDriverInfoFromReg( HKEY hkeyDrivers, LPWSTR DriverName, - LPWSTR pEnvironment, + LPCWSTR pEnvironment, DWORD Level, LPBYTE ptr, /* DRIVER_INFO */ LPBYTE pDriverStrings, /* strings buffer */ @@ -3774,7 +3774,7 @@ static BOOL WINSPOOL_GetDriverInfoFromRe ((PDRIVER_INFO_2A) ptr)->cVersion = (GetVersion() & 0x80000000) ? 0 : 3; /* FIXME: add 1, 2 */ if(!pEnvironment) - pEnvironment = (LPWSTR)DefaultEnvironmentW; + pEnvironment = DefaultEnvironmentW; if(unicode) size = (lstrlenW(pEnvironment) + 1) * sizeof(WCHAR); else @@ -6567,17 +6567,30 @@ end: /***************************************************************************** * StartDocDlgA [WINSPOOL.@] */ - LPSTR WINAPI StartDocDlgA( HANDLE hPrinter, DOCINFOA *doc ) +LPSTR WINAPI StartDocDlgA( HANDLE hPrinter, DOCINFOA *doc ) { UNICODE_STRING usBuffer; DOCINFOW docW; LPWSTR retW; + LPWSTR docnameW = NULL, outputW = NULL, datatypeW = NULL; LPSTR ret = NULL; docW.cbSize = sizeof(docW); - docW.lpszDocName = asciitounicode(&usBuffer, doc->lpszDocName); - docW.lpszOutput = asciitounicode(&usBuffer, doc->lpszOutput); - docW.lpszDatatype = asciitounicode(&usBuffer, doc->lpszDatatype); + if (doc->lpszDocName) + { + docnameW = asciitounicode(&usBuffer, doc->lpszDocName); + if (!(docW.lpszDocName = docnameW)) return NULL; + } + if (doc->lpszOutput) + { + outputW = asciitounicode(&usBuffer, doc->lpszOutput); + if (!(docW.lpszOutput = outputW)) return NULL; + } + if (doc->lpszDatatype) + { + datatypeW = asciitounicode(&usBuffer, doc->lpszDatatype); + if (!(docW.lpszDatatype = datatypeW)) return NULL; + } docW.fwType = doc->fwType; retW = StartDocDlgW(hPrinter, &docW); @@ -6590,9 +6603,9 @@ end: HeapFree(GetProcessHeap(), 0, retW); } - HeapFree(GetProcessHeap(), 0, (LPWSTR)docW.lpszDatatype); - HeapFree(GetProcessHeap(), 0, (LPWSTR)docW.lpszOutput); - HeapFree(GetProcessHeap(), 0, (LPWSTR)docW.lpszDocName); + HeapFree(GetProcessHeap(), 0, datatypeW); + HeapFree(GetProcessHeap(), 0, outputW); + HeapFree(GetProcessHeap(), 0, docnameW); return ret; }

1 0

Kai Blin : secur32: Add support for cached client credentials.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 640d87dfc60b9c752d10a0a3fc9fe6e8857f6930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=640d87dfc60b9c752d10a0a3f… Author: Kai Blin <kai.blin(a)gmail.com> Date: Fri Oct 6 12:11:05 2006 +0200 secur32: Add support for cached client credentials. --- dlls/secur32/ntlm.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index bfa5418..37b7253 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -88,15 +88,16 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac SECURITY_STATUS ret; PNegoHelper helper = NULL; static CHAR ntlm_auth[] = "ntlm_auth", - helper_protocol[] = "--helper-protocol=squid-2.5-ntlmssp"; + server_helper_protocol[] = "--helper-protocol=squid-2.5-ntlmssp", + credentials_argv[] = "--use-cached-creds"; SEC_CHAR *client_user_arg = NULL; SEC_CHAR *client_domain_arg = NULL; SEC_WCHAR *username = NULL, *domain = NULL; - SEC_CHAR *client_argv[5]; + SEC_CHAR *client_argv[6]; SEC_CHAR *server_argv[] = { ntlm_auth, - helper_protocol, + server_helper_protocol, NULL }; TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p)\n", @@ -196,9 +197,10 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac client_argv[1] = helper_protocol; client_argv[2] = client_user_arg; client_argv[3] = client_domain_arg; - client_argv[4] = NULL; + client_argv[4] = credentials_argv; + client_argv[5] = NULL; - if((ret = fork_helper(&helper, "ntlm_auth", client_argv)) != + if((ret = fork_helper(&helper, "ntlm_auth", client_argv)) != SEC_E_OK) { phCredential = NULL; @@ -460,11 +462,21 @@ static SECURITY_STATUS SEC_ENTRY ntlm_In if(fContextReq & ISC_REQ_STREAM) FIXME("ISC_REQ_STREAM\n"); - /* Request a challenge request from ntlm_auth */ + /* If no password is given, try to use cached credentials. Fall back to an empty + * password if this failed. */ if(helper->password == NULL) { - FIXME("Using empty password for now.\n"); - lstrcpynA(buffer, "PW AA==", max_len-1); + lstrcpynA(buffer, "OK", max_len-1); + if((ret = run_helper(helper, buffer, max_len, &buffer_len)) != SEC_E_OK) + goto isc_end; + /* If the helper replied with "PW", using cached credentials failed */ + if(!strncmp(buffer, "PW", 2)) + { + TRACE("Using cached credentials failed. Using empty password."); + lstrcpynA(buffer, "PW AA==", max_len-1); + } + else /* Just do a noop on the next run */ + lstrcpynA(buffer, "OK", max_len-1); } else {

1 0

Paul Chitescu : mscoree: Initial stub implementation.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 4fe6c3fa450f2eeece7d5408771e57ea610ea6c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fe6c3fa450f2eeece7d54087… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Fri Oct 6 12:21:02 2006 +0300 mscoree: Initial stub implementation. --- Makefile.in | 2 + configure | 3 +- configure.ac | 1 + dlls/Makefile.in | 1 + dlls/mscoree/Makefile.in | 13 +++++++ dlls/mscoree/mscoree.spec | 5 +++ dlls/mscoree/mscoree_main.c | 85 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 109 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4fe6c3fa450f2eeece7d5…

1 0

Francois Gouget : dmloader: Modify the debugstr_DMUS_* functions to return strings that never end with a '\n'.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 5d6ab30c589ef5830c5f0937d9a248057a456f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d6ab30c589ef5830c5f0937d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 6 13:02:46 2006 +0200 dmloader: Modify the debugstr_DMUS_* functions to return strings that never end with a '\n'. --- dlls/dmloader/container.c | 4 ++-- dlls/dmloader/debug.c | 38 +++++++++++++++++++------------------- dlls/dmloader/loader.c | 6 +++--- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 2eda426..b93cbfe 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -500,7 +500,7 @@ static HRESULT WINAPI IDirectMusicContai case DMUS_FOURCC_CONTAINER_CHUNK: { TRACE_(dmfile)(": container header chunk\n"); IStream_Read (pStm, &This->Header, Chunk.dwSize, NULL); - TRACE_(dmdump)(": container header chunk:\n%s", debugstr_DMUS_IO_CONTAINER_HEADER(&This->Header)); + TRACE_(dmdump)(": container header chunk:\n%s\n", debugstr_DMUS_IO_CONTAINER_HEADER(&This->Header)); break; } case DMUS_FOURCC_GUID_CHUNK: { @@ -615,7 +615,7 @@ static HRESULT WINAPI IDirectMusicContai DMUS_IO_CONTAINED_OBJECT_HEADER tmpObjectHeader; TRACE_(dmfile)(": contained object header chunk\n"); IStream_Read (pStm, &tmpObjectHeader, Chunk.dwSize, NULL); - TRACE_(dmdump)(": contained object header: \n%s", debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER(&tmpObjectHeader)); + TRACE_(dmdump)(": contained object header: \n%s\n", debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER(&tmpObjectHeader)); /* copy guidClass */ pNewEntry->Desc.dwValidData |= DMUS_OBJ_CLASS; memcpy (&pNewEntry->Desc.guidClass, &tmpObjectHeader.guidClassID, sizeof(GUID)); diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 68b76d5..7d98b29 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -484,19 +484,19 @@ const char *debugstr_DMUS_OBJECTDESC (LP if (pDesc) { char buffer[1024] = "", *ptr = &buffer[0]; - ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):\n", pDesc); - ptr += sprintf(ptr, " - dwSize = 0x%08lX\n", pDesc->dwSize); - ptr += sprintf(ptr, " - dwValidData = 0x%08lX ( %s)\n", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); - if (pDesc->dwValidData & DMUS_OBJ_CLASS) ptr += sprintf(ptr, " - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) ptr += sprintf(ptr, " - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) ptr += sprintf(ptr, " - ftDate = %s\n", debugstr_filetime (&pDesc->ftDate)); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) ptr += sprintf(ptr, " - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); - if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):", pDesc); + ptr += sprintf(ptr, "\n - dwSize = 0x%08lX", pDesc->dwSize); + ptr += sprintf(ptr, "\n - dwValidData = 0x%08lX (%s)", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); + if (pDesc->dwValidData & DMUS_OBJ_CLASS) ptr += sprintf(ptr, "\n - guidClass = %s", debugstr_dmguid(&pDesc->guidClass)); + if (pDesc->dwValidData & DMUS_OBJ_OBJECT) ptr += sprintf(ptr, "\n - guidObject = %s", debugstr_guid(&pDesc->guidObject)); + if (pDesc->dwValidData & DMUS_OBJ_DATE) ptr += sprintf(ptr, "\n - ftDate = %s", debugstr_filetime (&pDesc->ftDate)); + if (pDesc->dwValidData & DMUS_OBJ_VERSION) ptr += sprintf(ptr, " - vVersion = %s", debugstr_dmversion(&pDesc->vVersion)); + if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, "\n - wszName = %s", debugstr_w(pDesc->wszName)); + if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, "\n - wszCategory = %s", debugstr_w(pDesc->wszCategory)); + if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, "\n - wszFileName = %s", debugstr_w(pDesc->wszFileName)); + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, "\n - llMemLength = 0x%s\n - pbMemData = %p", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); - if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream); + if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, "\n - pStream = %p", pDesc->pStream); ptr = &buffer[0]; return ptr; @@ -509,8 +509,8 @@ const char *debugstr_DMUS_IO_CONTAINER_H if (pHeader) { char buffer[1024] = "", *ptr = &buffer[0]; - ptr += sprintf(ptr, "DMUS_IO_CONTAINER_HEADER (%p):\n", pHeader); - ptr += sprintf(ptr, " - dwFlags = %s\n", debugstr_DMUS_CONTAINER_FLAGS(pHeader->dwFlags)); + ptr += sprintf(ptr, "DMUS_IO_CONTAINER_HEADER (%p):", pHeader); + ptr += sprintf(ptr, "\n - dwFlags = %s", debugstr_DMUS_CONTAINER_FLAGS(pHeader->dwFlags)); ptr = &buffer[0]; return ptr; @@ -523,11 +523,11 @@ const char *debugstr_DMUS_IO_CONTAINED_O if (pHeader) { char buffer[1024] = "", *ptr = &buffer[0]; - ptr += sprintf(ptr, "DMUS_IO_CONTAINED_OBJECT_HEADER (%p):\n", pHeader); - ptr += sprintf(ptr, " - guidClassID = %s\n", debugstr_dmguid(&pHeader->guidClassID)); - ptr += sprintf(ptr, " - dwFlags = %s\n", debugstr_DMUS_CONTAINED_OBJF_FLAGS (pHeader->dwFlags)); - ptr += sprintf(ptr, " - ckid = %s\n", debugstr_fourcc (pHeader->ckid)); - ptr += sprintf(ptr, " - fccType = %s\n", debugstr_fourcc (pHeader->fccType)); + ptr += sprintf(ptr, "DMUS_IO_CONTAINED_OBJECT_HEADER (%p):", pHeader); + ptr += sprintf(ptr, "\n - guidClassID = %s", debugstr_dmguid(&pHeader->guidClassID)); + ptr += sprintf(ptr, "\n - dwFlags = %s", debugstr_DMUS_CONTAINED_OBJF_FLAGS (pHeader->dwFlags)); + ptr += sprintf(ptr, "\n - ckid = %s", debugstr_fourcc (pHeader->ckid)); + ptr += sprintf(ptr, "\n - fccType = %s", debugstr_fourcc (pHeader->fccType)); ptr = &buffer[0]; return ptr; diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index c429b81..4c67a19 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -78,7 +78,7 @@ static HRESULT WINAPI IDirectMusicLoader DMUS_OBJECTDESC GotDesc; BOOL bCache; - TRACE("(%p, %p, %s, %p): pDesc:\n%s", This, pDesc, debugstr_dmguid(riid), ppv, debugstr_DMUS_OBJECTDESC(pDesc)); + TRACE("(%p, %p, %s, %p): pDesc:\n%s\n", This, pDesc, debugstr_dmguid(riid), ppv, debugstr_DMUS_OBJECTDESC(pDesc)); /* sometimes it happens that guidClass is missing... which is a BadThingTM */ if (!(pDesc->dwValidData & DMUS_OBJ_CLASS)) { @@ -308,7 +308,7 @@ #if 0 LIST_FOR_EACH (pEntry, This->pObjects) { i++; pObjectEntry = LIST_ENTRY(pEntry, WINE_LOADER_ENTRY, entry); - TRACE(": entry nr. %i:\n%s - bInvalidDefaultDLS = %i\n - pObject = %p\n", i, debugstr_DMUS_OBJECTDESC(&pObjectEntry->Desc), pObjectEntry->bInvalidDefaultDLS, pObjectEntry->pObject); + TRACE(": entry nr. %i:\n%s\n - bInvalidDefaultDLS = %i\n - pObject = %p\n", i, debugstr_DMUS_OBJECTDESC(&pObjectEntry->Desc), pObjectEntry->bInvalidDefaultDLS, pObjectEntry->pObject); } #endif @@ -611,7 +611,7 @@ static HRESULT WINAPI IDirectMusicLoader if ((Desc.dwValidData & DMUS_OBJ_OBJECT) && (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_OBJECT | DMUS_OBJ_LOADED)) && IsEqualGUID (&Desc.guidObject, &pObjectEntry->Desc.guidObject)) { - TRACE(": found it by object GUID\n%s", debugstr_DMUS_OBJECTDESC(&pObjectEntry->Desc)); + TRACE(": found it by object GUID\n%s\n", debugstr_DMUS_OBJECTDESC(&pObjectEntry->Desc)); result = S_OK; break; }

1 0

Francois Gouget : Tweak TRACE()s to simplify '\n' checks.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: dd28d5be081ff6b56915a8b920723b154a87bc7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd28d5be081ff6b56915a8b92… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 6 13:01:06 2006 +0200 Tweak TRACE()s to simplify '\n' checks. --- dlls/oleaut32/variant.c | 6 +++--- dlls/usp10/usp10.c | 5 +++-- dlls/wintab32/context.c | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index c8044a9..3d1e67c 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2084,9 +2084,9 @@ HRESULT WINAPI VarNumFromParseNum(NUMPAR multiplier10 = pNumprs->nPwr10; } - TRACE("cDig %d; nPwr10 %d, whole %d, frac %d ", pNumprs->cDig, - pNumprs->nPwr10, wholeNumberDigits, fractionalDigits); - TRACE("mult %d; div %d\n", multiplier10, divisor10); + TRACE("cDig %d; nPwr10 %d, whole %d, frac %d mult %d; div %d\n", + pNumprs->cDig, pNumprs->nPwr10, wholeNumberDigits, fractionalDigits, + multiplier10, divisor10); if (dwVtBits & (INTEGER_VTBITS|VTBIT_DECIMAL) && (!fractionalDigits || !(dwVtBits & (REAL_VTBITS|VTBIT_CY|VTBIT_DECIMAL)))) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c1fceff..8bcd38b 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -340,8 +340,9 @@ #define Script_Numeric 5 pItems[index].a.s.fGcpClusters = 0; pItems[index].a.s.fReserved = 0; pItems[index].a.s.fEngineReserved = 0; - TRACE("New_Script=%d, eScript=%d ", New_Script, pItems[index].a.eScript); - TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos = cnt); + TRACE("New_Script=%d, eScript=%d index=%d cnt=%d iCharPos=%d\n", + New_Script, pItems[index].a.eScript, index, cnt, + pItems[index].iCharPos = cnt); for (cnt=0; cnt < cInChars; cnt++) { diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 8fa544d..b22c2d2 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -94,7 +94,7 @@ static inline void DUMPCONTEXT(LOGCONTEX CHAR bits1[100]; CHAR bits2[100]; - sprintf(mmsg,"%s, %x, %x, %x, %x, %x, %x, %x%s, %x%s, %x%s, %x, %x, %i, %i, %i, %li ,%li, %li, %li, %li, %li,%li, %li, %li, %li, %li, %li, %i, %i, %i, %i, %i %li %li\n", + sprintf(mmsg,"%s, %x, %x, %x, %x, %x, %x, %x%s, %x%s, %x%s, %x, %x, %i, %i, %i, %li ,%li, %li, %li, %li, %li,%li, %li, %li, %li, %li, %li, %i, %i, %i, %i, %i %li %li", debugstr_a(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, lc.lcDevice, lc.lcPktRate, (UINT)lc.lcPktData, DUMPBITS(lc.lcPktData,bits), (UINT)lc.lcPktMode, DUMPBITS(lc.lcPktMode,bits1), (UINT)lc.lcMoveMask, @@ -104,7 +104,7 @@ lc.lcInExtZ, lc.lcOutOrgX, lc.lcOutOrgY, lc.lcOutExtY, lc.lcOutExtZ, lc.lcSensX, lc.lcSensY, lc.lcSensZ, lc.lcSysMode, lc.lcSysOrgX, lc.lcSysOrgY, lc.lcSysExtX, lc.lcSysExtY, lc.lcSysSensX, lc.lcSysSensY); - TRACE("context: %s",mmsg); + TRACE("context: %s\n",mmsg); }

1 0

Francois Gouget : wined3d: Fix '\n' typo.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 4b248447c002de88e9ec1248cb31ca1deb1380e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b248447c002de88e9ec1248c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 6 12:54:00 2006 +0200 wined3d: Fix '\n' typo. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 33b4fb5..bf2f059 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1508,7 +1508,7 @@ static HRESULT WINAPI IWineD3DImpl_Check WineD3D_ReleaseFakeGLContext(ctx); if (hr != WINED3D_OK) - TRACE_(d3d_caps)("Failed to match stencil format to device\b"); + TRACE_(d3d_caps)("Failed to match stencil format to device\n"); TRACE_(d3d_caps)("(%p) : Returning %x\n", This, hr); return hr;

1 0

Hans Leidekker : usp10: Add a stub implementation of ScriptStringValidate.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 539a96240accc01c15ce008d034cdd8e1777b10b URL: http://source.winehq.org/git/wine.git/?a=commit;h=539a96240accc01c15ce008d0… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Oct 6 12:43:49 2006 +0200 usp10: Add a stub implementation of ScriptStringValidate. --- dlls/usp10/usp10.c | 19 +++++++++++++++++++ dlls/usp10/usp10.spec | 2 +- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 3a226e3..c1fceff 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1171,3 +1171,22 @@ HRESULT WINAPI ScriptLayout(int runs, co } return S_OK; } + +/*********************************************************************** + * ScriptStringValidate (USP10.@) + * + * Validate a string analysis. + * + * PARAMS + * ssa [I] string analysis. + * + * RETURNS + * Success: S_OK + * Failure: S_FALSE if invalid sequences are found + * or a non-zero HRESULT if it fails. + */ +HRESULT WINAPI ScriptStringValidate(SCRIPT_STRING_ANALYSIS ssa) +{ + FIXME("(%p): stub\n", ssa); + return S_OK; +} diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 95a6c77..56fd85b 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -23,7 +23,7 @@ @ stub ScriptStringGetLogicalWidths @ stub ScriptStringGetOrder @ stdcall ScriptStringOut(ptr long long long ptr long long long) -@ stub ScriptStringValidate +@ stdcall ScriptStringValidate(ptr) @ stdcall ScriptStringXtoCP(ptr long ptr ptr) @ stub ScriptString_pLogAttr @ stub ScriptString_pSize

1 0

Hans Leidekker : shlwapi: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: e119a04a2699d50129bfbf0aebd56a344a588d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e119a04a2699d50129bfbf0ae… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Oct 6 12:43:28 2006 +0200 shlwapi: Win64 printf format warning fixes. --- dlls/shlwapi/Makefile.in | 2 - dlls/shlwapi/assoc.c | 28 +++++++------ dlls/shlwapi/clist.c | 6 +-- dlls/shlwapi/istream.c | 32 ++++++++------- dlls/shlwapi/msgbox.c | 2 - dlls/shlwapi/ordinal.c | 90 ++++++++++++++++++++++--------------------- dlls/shlwapi/path.c | 28 +++++++------ dlls/shlwapi/reg.c | 88 +++++++++++++++++++++--------------------- dlls/shlwapi/regstream.c | 16 ++++---- dlls/shlwapi/shlwapi_main.c | 4 +- dlls/shlwapi/stopwatch.c | 6 +-- dlls/shlwapi/string.c | 12 +++--- dlls/shlwapi/thread.c | 8 ++-- dlls/shlwapi/url.c | 40 ++++++++++--------- 14 files changed, 181 insertions(+), 181 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e119a04a2699d50129bfb…

1 0