May 2007 - Wine-commits - list.winehq.org

Juan Lang : wintrust: Implement WintrustLoadFunctionPointers.
by Alexandre Julliard 03 May '07

03 May '07

Module: wine Branch: master Commit: 07a7079e2284e82376dc26ef838ed6a89d38c098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07a7079e2284e82376dc26ef8… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed May 2 07:43:08 2007 -0700 wintrust: Implement WintrustLoadFunctionPointers. --- dlls/wintrust/register.c | 82 ++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/tests/register.c | 31 +++++++++++++++ dlls/wintrust/wintrust_main.c | 11 ----- 3 files changed, 113 insertions(+), 11 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 6f0f575..d16b186 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -771,6 +771,88 @@ BOOL WINAPI WintrustAddDefaultForUsage(const char *pszUsageOID, return TRUE; } +static FARPROC WINTRUST_ReadProviderFromReg(WCHAR *GuidString, const WCHAR *FunctionType) +{ + WCHAR ProvKey[MAX_PATH], DllName[MAX_PATH]; + char FunctionName[MAX_PATH]; + HKEY Key; + LONG Res = ERROR_SUCCESS; + DWORD Size; + HMODULE Lib; + FARPROC Func = NULL; + + /* Create the needed key string */ + ProvKey[0]='\0'; + lstrcatW(ProvKey, Trust); + lstrcatW(ProvKey, FunctionType); + lstrcatW(ProvKey, GuidString); + + Res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, ProvKey, 0, KEY_READ, &Key); + if (Res != ERROR_SUCCESS) goto error_close_key; + + /* Read the $DLL entry */ + Size = sizeof(DllName); + Res = RegQueryValueExW(Key, Dll, NULL, NULL, (LPBYTE)DllName, &Size); + if (Res != ERROR_SUCCESS) goto error_close_key; + + /* Read the $Function entry */ + Size = sizeof(FunctionName); + Res = RegQueryValueExA(Key, "$Function", NULL, NULL, (LPBYTE)FunctionName, &Size); + if (Res != ERROR_SUCCESS) goto error_close_key; + + /* Load the library - there appears to be no way to close a provider, so + * just leak the module handle. + */ + Lib = LoadLibraryW(DllName); + Func = GetProcAddress(Lib, FunctionName); + +error_close_key: + RegCloseKey(Key); + + return Func; +} + +/*********************************************************************** + * WintrustLoadFunctionPointers (WINTRUST.@) + */ +BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, + CRYPT_PROVIDER_FUNCTIONS* pPfns ) +{ + WCHAR GuidString[39]; + + TRACE("(%s %p)\n", debugstr_guid(pgActionID), pPfns); + + if (!pPfns) return FALSE; + if (!pgActionID) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (pPfns->cbStruct != sizeof(CRYPT_PROVIDER_FUNCTIONS)) return FALSE; + + /* Create this string only once, instead of in the helper function */ + WINTRUST_Guid2Wstr( pgActionID, GuidString); + + /* Get the function pointers from the registry, where applicable */ + pPfns->pfnAlloc = NULL; + pPfns->pfnFree = NULL; + pPfns->pfnAddStore2Chain = NULL; + pPfns->pfnAddSgnr2Chain = NULL; + pPfns->pfnAddCert2Chain = NULL; + pPfns->pfnAddPrivData2Chain = NULL; + pPfns->psUIpfns = NULL; + pPfns->pfnInitialize = (PFN_PROVIDER_INIT_CALL)WINTRUST_ReadProviderFromReg(GuidString, Initialization); + pPfns->pfnObjectTrust = (PFN_PROVIDER_OBJTRUST_CALL)WINTRUST_ReadProviderFromReg(GuidString, Message); + pPfns->pfnSignatureTrust = (PFN_PROVIDER_SIGTRUST_CALL)WINTRUST_ReadProviderFromReg(GuidString, Signature); + pPfns->pfnCertificateTrust = (PFN_PROVIDER_CERTTRUST_CALL)WINTRUST_ReadProviderFromReg(GuidString, Certificate); + pPfns->pfnCertCheckPolicy = (PFN_PROVIDER_CERTCHKPOLICY_CALL)WINTRUST_ReadProviderFromReg(GuidString, CertCheck); + pPfns->pfnFinalPolicy = (PFN_PROVIDER_FINALPOLICY_CALL)WINTRUST_ReadProviderFromReg(GuidString, FinalPolicy); + pPfns->pfnTestFinalPolicy = (PFN_PROVIDER_TESTFINALPOLICY_CALL)WINTRUST_ReadProviderFromReg(GuidString, DiagnosticPolicy); + pPfns->pfnCleanupPolicy = (PFN_PROVIDER_CLEANUP_CALL)WINTRUST_ReadProviderFromReg(GuidString, Cleanup); + + return TRUE; +} + /*********************************************************************** * WINTRUST_SIPPAddProvider * diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index d442c07..95f8dc6 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -31,6 +31,7 @@ static BOOL (WINAPI * pWintrustAddActionID)(GUID*, DWORD, CRYPT_REGISTER_ACTIONID*); static BOOL (WINAPI * pWintrustAddDefaultForUsage)(const CHAR*,CRYPT_PROVIDER_REGDEFUSAGE*); static BOOL (WINAPI * pWintrustRemoveActionID)(GUID*); +static BOOL (WINAPI * pWintrustLoadFunctionPointers)(GUID *, CRYPT_PROVIDER_FUNCTIONS *); static HMODULE hWintrust = 0; @@ -55,6 +56,7 @@ static BOOL InitFunctionPtrs(void) WINTRUST_GET_PROC(WintrustAddActionID) WINTRUST_GET_PROC(WintrustAddDefaultForUsage) WINTRUST_GET_PROC(WintrustRemoveActionID) + WINTRUST_GET_PROC(WintrustLoadFunctionPointers) return TRUE; } @@ -256,6 +258,34 @@ static void test_AddDefaultForUsage(void) } } +static void test_LoadFunctionPointers(void) +{ + BOOL ret; + CRYPT_PROVIDER_FUNCTIONS funcs; + GUID action = WINTRUST_ACTION_GENERIC_VERIFY_V2; + + SetLastError(0xdeadbeef); + ret = pWintrustLoadFunctionPointers(NULL, NULL); + ok(!ret && GetLastError() == 0xdeadbeef, "Expected failure\n"); + SetLastError(0xdeadbeef); + ret = pWintrustLoadFunctionPointers(&action, NULL); + ok(!ret && GetLastError() == 0xdeadbeef, "Expected failure\n"); + + SetLastError(0xdeadbeef); + ret = pWintrustLoadFunctionPointers(NULL, &funcs); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + funcs.cbStruct = 0; + ret = pWintrustLoadFunctionPointers(&action, &funcs); + ok(!ret && GetLastError() == 0xdeadbeef, "Expected failure\n"); + SetLastError(0xdeadbeef); + funcs.cbStruct = sizeof(funcs); + ret = pWintrustLoadFunctionPointers(&action, &funcs); + ok(ret, "WintrustLoadFunctionPointers failed: %d\n", GetLastError()); +} + START_TEST(register) { if(!InitFunctionPtrs()) @@ -263,6 +293,7 @@ START_TEST(register) test_AddRem_ActionID(); test_AddDefaultForUsage(); + test_LoadFunctionPointers(); FreeLibrary(hWintrust); } diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 41c97d9..073a369 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -119,17 +119,6 @@ CRYPT_PROVIDER_DATA * WINAPI WTHelperProvDataFromStateData(HANDLE hStateData) } /*********************************************************************** - * WintrustLoadFunctionPointers (WINTRUST.@) - */ -BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, - CRYPT_PROVIDER_FUNCTIONS* pPfns ) -{ - FIXME("%s %p\n", debugstr_guid(pgActionID), pPfns); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/*********************************************************************** * WintrustGetRegPolicyFlags (WINTRUST.@) */ void WINAPI WintrustGetRegPolicyFlags( DWORD* pdwPolicyFlags )

1 0

Aric Stewart : gdi32: GetGlyphOutline needs to look at linked fonts as well .
by Alexandre Julliard 03 May '07

03 May '07

Module: wine Branch: master Commit: ec9f7550865f6d4bd2629016452bc3085cbf9d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec9f7550865f6d4bd26290164… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 2 11:15:12 2007 -0500 gdi32: GetGlyphOutline needs to look at linked fonts as well. --- dlls/gdi32/freetype.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index caadf4b..d3ca23b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -439,6 +439,7 @@ static BOOL have_installed_roman_font = FALSE; /* CreateFontInstance will fail i static const WCHAR font_mutex_nameW[] = {'_','_','W','I','N','E','_','F','O','N','T','_','M','U','T','E','X','_','_','\0'}; +static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, FT_UInt *glyph); /**************************************** * Notes on .fon files @@ -3354,12 +3355,13 @@ DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count, * question rather than an HDC. * */ -DWORD WineEngGetGlyphOutline(GdiFont *font, UINT glyph, UINT format, +DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, LPGLYPHMETRICS lpgm, DWORD buflen, LPVOID buf, const MAT2* lpmat) { static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; - FT_Face ft_face = font->ft_face; + FT_Face ft_face = incoming_font->ft_face; + GdiFont *font = incoming_font; FT_UInt glyph_index; DWORD width, height, pitch, needed = 0; FT_Bitmap ft_bitmap; @@ -3378,8 +3380,10 @@ DWORD WineEngGetGlyphOutline(GdiFont *font, UINT glyph, UINT format, if(format & GGO_GLYPH_INDEX) { glyph_index = glyph; format &= ~GGO_GLYPH_INDEX; - } else - glyph_index = get_glyph_index(font, glyph); + } else { + get_glyph_index_linked(incoming_font, glyph, &font, &glyph_index); + ft_face = font->ft_face; + } if(glyph_index >= font->gmsize) { font->gmsize = (glyph_index / INIT_GM_SIZE + 1) * INIT_GM_SIZE;

1 0

Maarten Lankhorst : winealsa: Improve sound mixer detection.
by Alexandre Julliard 03 May '07

03 May '07

Module: wine Branch: master Commit: 3006b9335cd3696486305b532e9a6d0a7b1fc45a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3006b9335cd3696486305b532… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 2 20:09:49 2007 +0200 winealsa: Improve sound mixer detection. The previous mixer code depended on the existence of 1 'Master', and 1 'Capture' control. According to some feedback in wine-devel this is not always the case, the new code will try the following order for loading: Destination waveout: Master, Headphone PCM Destination wavein: Capture --- dlls/winealsa.drv/mixer.c | 237 +++++++++++++++++++++++++++------------------ 1 files changed, 142 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3006b9335cd3696486305…

1 0

lostwages/templates/en download-deb.template
by Jeremy Newman 02 May '07

02 May '07

ChangeSet ID: 31123 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/05/02 10:04:37 Modified files: templates/en : download-deb.template Log message: Scott Ritchie <scott(a)open-vote.org> Add Debian etch to download-deb page Patch: http://cvs.winehq.org/patch.py?id=31123 Old revision New revision Changes Path 1.15 1.16 +6 -0 lostwages/templates/en/download-deb.template Index: lostwages/templates/en/download-deb.template diff -u -p lostwages/templates/en/download-deb.template:1.15 lostwages/templates/en/download-deb.template:1.16 --- lostwages/templates/en/download-deb.template:1.15 2 May 2007 15: 4:37 -0000 +++ lostwages/templates/en/download-deb.template 2 May 2007 15: 4:37 -0000 @@ -12,6 +12,10 @@ distributions have their own repositorie Wine, however we keep our own repository of the latest available packages here for download. +There used to be graphical instructions here, however we have found that the terminal commands are actually simpler to +describe and quicker for the user to input. Because the commands below use sudo, you may have to enter your user +password after hitting enter. + <h2>Adding the WineHQ APT Repository:</h2> First, open a terminal window. Then add the repository's key to your system's @@ -27,6 +31,8 @@ list of trusted APT keys by copy and pas sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/edgy.list -O /etc/apt/sources.list.d/winehq.list For Ubuntu Dapper (6.06): sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/dapper.list -O /etc/apt/sources.list.d/winehq.list +For Debian Etch (4.0): +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/etch.list -O /etc/apt/sources.list.d/winehq.list Then, you can install Wine from WineHQ like it were any other package, such as by using the Synaptic Package Manager under System->Administration. Alternatively, you

1 0

Rob Shearman : ole32: Remove an unnecessary QueryInterface in CoRegisterClassObject that CoMarshalInterface will already do .
by Alexandre Julliard 02 May '07

02 May '07

Module: wine Branch: master Commit: c582136d0bea0e0aaf533397db2e86937611b7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c582136d0bea0e0aaf533397d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 2 13:21:22 2007 +0100 ole32: Remove an unnecessary QueryInterface in CoRegisterClassObject that CoMarshalInterface will already do. --- dlls/ole32/compobj.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index af43074..3e3eef7 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1724,29 +1724,19 @@ HRESULT WINAPI CoRegisterClassObject( *lpdwRegister = newClass->dwCookie; if (dwClsContext & CLSCTX_LOCAL_SERVER) { - IClassFactory *classfac; - - hr = IUnknown_QueryInterface(newClass->classObject, &IID_IClassFactory, - (LPVOID*)&classfac); - if (hr) return hr; - hr = CreateStreamOnHGlobal(0, TRUE, &newClass->pMarshaledData); if (hr) { FIXME("Failed to create stream on hglobal, %x\n", hr); - IUnknown_Release(classfac); return hr; } hr = CoMarshalInterface(newClass->pMarshaledData, &IID_IClassFactory, - (LPVOID)classfac, MSHCTX_LOCAL, NULL, + newClass->classObject, MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); if (hr) { FIXME("CoMarshalInterface failed, %x!\n",hr); - IUnknown_Release(classfac); return hr; } - IUnknown_Release(classfac); - hr = RPC_StartLocalServer(&newClass->classIdentifier, newClass->pMarshaledData, flags & (REGCLS_MULTIPLEUSE|REGCLS_MULTI_SEPARATE),

1 0

Jason Edmeades : xcopy: Output to console in Unicode if possible, or OEM codepage otherwise.
by Alexandre Julliard 02 May '07

02 May '07

Module: wine Branch: master Commit: a2fa763008b56cbd2b0f407e341bc7b83bbdae2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2fa763008b56cbd2b0f407e3… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Apr 26 21:38:04 2007 +0100 xcopy: Output to console in Unicode if possible, or OEM codepage otherwise. --- programs/xcopy/xcopy.c | 115 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 98 insertions(+), 17 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index f132dcb..8dd20d9 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -60,6 +60,7 @@ static BOOL XCOPY_ProcessExcludeList(WCHAR* parms); static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName); static WCHAR *XCOPY_LoadMessage(UINT id); static void XCOPY_FailMessage(DWORD err); +static int XCOPY_wprintf(const WCHAR *format, ...); /* Typedefs */ typedef struct _EXCLUDELIST @@ -118,7 +119,7 @@ int main (int argc, char *argv[]) /* Confirm at least one parameter */ if (argc < 2) { - wprintf(XCOPY_LoadMessage(STRING_INVPARMS)); + XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARMS)); return RC_INITERROR; } @@ -152,7 +153,7 @@ int main (int argc, char *argv[]) } else if (supplieddestination[0] == 0x00) { lstrcpyW(supplieddestination, *argvW); } else { - wprintf(XCOPY_LoadMessage(STRING_INVPARMS)); + XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARMS)); return RC_INITERROR; } } else { @@ -242,11 +243,11 @@ int main (int argc, char *argv[]) case '-': if (toupper(argvW[0][2])=='Y') flags &= ~OPT_NOPROMPT; break; - case '?': wprintf(XCOPY_LoadMessage(STRING_HELP)); + case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP)); return RC_OK; default: WINE_TRACE("Unhandled parameter '%s'\n", wine_dbgstr_w(*argvW)); - wprintf(XCOPY_LoadMessage(STRING_INVPARM), *argvW); + XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARM), *argvW); return RC_INITERROR; } } @@ -281,7 +282,7 @@ int main (int argc, char *argv[]) DWORD count; char pausestr[10]; - wprintf(XCOPY_LoadMessage(STRING_PAUSE)); + XCOPY_wprintf(XCOPY_LoadMessage(STRING_PAUSE)); ReadFile (GetStdHandle(STD_INPUT_HANDLE), pausestr, sizeof(pausestr), &count, NULL); } @@ -301,9 +302,9 @@ int main (int argc, char *argv[]) /* Finished - print trailer and exit */ if (flags & OPT_SIMULATE) { - wprintf(XCOPY_LoadMessage(STRING_SIMCOPY), filesCopied); + XCOPY_wprintf(XCOPY_LoadMessage(STRING_SIMCOPY), filesCopied); } else if (!(flags & OPT_NOCOPY)) { - wprintf(XCOPY_LoadMessage(STRING_COPY), filesCopied); + XCOPY_wprintf(XCOPY_LoadMessage(STRING_COPY), filesCopied); } if (rc == RC_OK && filesCopied == 0) rc = RC_NOFILES; return rc; @@ -448,7 +449,7 @@ static int XCOPY_ProcessDestParm(WCHAR *supplieddestination, WCHAR *stem, WCHAR wcscpy(dirChar, XCOPY_LoadMessage(STRING_DIR_CHAR)); while (answer[0] != fileChar[0] && answer[0] != dirChar[0]) { - wprintf(XCOPY_LoadMessage(STRING_QISDIR), supplieddestination); + XCOPY_wprintf(XCOPY_LoadMessage(STRING_QISDIR), supplieddestination); ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer), &count, NULL); WINE_TRACE("User answer %c\n", answer[0]); @@ -641,7 +642,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, wcscpy(noChar, XCOPY_LoadMessage(STRING_NO_CHAR)); while (!answered) { - wprintf(XCOPY_LoadMessage(STRING_SRCPROMPT), copyFrom); + XCOPY_wprintf(XCOPY_LoadMessage(STRING_SRCPROMPT), copyFrom); ReadFile (GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer), &count, NULL); @@ -668,7 +669,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, wcscpy(noChar, XCOPY_LoadMessage(STRING_NO_CHAR)); while (!answered) { - wprintf(XCOPY_LoadMessage(STRING_OVERWRITE), copyTo); + XCOPY_wprintf(XCOPY_LoadMessage(STRING_OVERWRITE), copyTo); ReadFile (GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer), &count, NULL); @@ -692,9 +693,13 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, if (flags & OPT_QUIET) { /* Skip message */ } else if (flags & OPT_FULL) { - printf("%S -> %S\n", copyFrom, copyTo); + const WCHAR infostr[] = {'%', 's', ' ', '-', '>', ' ', + '%', 's', '\n', 0}; + + XCOPY_wprintf(infostr, copyFrom, copyTo); } else { - printf("%S\n", copyFrom); + const WCHAR infostr[] = {'%', 's', '\n', 0}; + XCOPY_wprintf(infostr, copyFrom); } /* If allowing overwriting of read only files, remove any @@ -710,7 +715,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, } else if (CopyFile(copyFrom, copyTo, FALSE) == 0) { DWORD error = GetLastError(); - wprintf(XCOPY_LoadMessage(STRING_COPYFAIL), + XCOPY_wprintf(XCOPY_LoadMessage(STRING_COPYFAIL), copyFrom, copyTo, error); XCOPY_FailMessage(error); @@ -888,7 +893,7 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) { /* Open the file */ inFile = _wfopen(filename, readTextMode); if (inFile == NULL) { - wprintf(XCOPY_LoadMessage(STRING_OPENFAIL), filename); + XCOPY_wprintf(XCOPY_LoadMessage(STRING_OPENFAIL), filename); *endOfName = endChar; return TRUE; } @@ -916,7 +921,7 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) { /* See if EOF or error occurred */ if (!feof(inFile)) { - wprintf(XCOPY_LoadMessage(STRING_READFAIL), filename); + XCOPY_wprintf(XCOPY_LoadMessage(STRING_READFAIL), filename); *endOfName = endChar; return TRUE; } @@ -932,7 +937,7 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) { * Returns string retrieved from resource file * ========================================================================= */ static WCHAR *XCOPY_LoadMessage(UINT id) { - static WCHAR msg[2048]; + static WCHAR msg[MAXSTRING]; const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0}; if (!LoadString(GetModuleHandle(NULL), id, msg, sizeof(msg))) { @@ -958,7 +963,83 @@ static void XCOPY_FailMessage(DWORD err) { WINE_FIXME("FIXME: Cannot display message for error %d, status %d\n", err, GetLastError()); } else { - printf("%S\n", lpMsgBuf); + const WCHAR infostr[] = {'%', 's', '\n', 0}; + XCOPY_wprintf(infostr, lpMsgBuf); LocalFree ((HLOCAL)lpMsgBuf); } } + +/* ========================================================================= + * Output a formatted unicode string. Ideally this will go to the console + * and hence required WriteConsoleW to output it, however if file i/o is + * redirected, it needs to be WriteFile'd using OEM (not ANSI) format + * ========================================================================= */ +int XCOPY_wprintf(const WCHAR *format, ...) { + + static WCHAR *output_bufW = NULL; + static char *output_bufA = NULL; + static BOOL toConsole = TRUE; + static BOOL traceOutput = FALSE; +#define MAX_WRITECONSOLE_SIZE 65535 + + va_list parms; + DWORD len, nOut; + DWORD res = 0; + + /* + * Allocate buffer to use when writing to console + * Note: Not freed - memory will be allocated once and released when + * xcopy ends + */ + + if (!output_bufW) output_bufW = HeapAlloc(GetProcessHeap(), 0, + MAX_WRITECONSOLE_SIZE); + if (!output_bufW) { + WINE_FIXME("Out of memory - could not allocate 2 x 64K buffers\n"); + return 0; + } + + /* Use wvsprintf to store output into unicode buffer */ + va_start(parms, format); + len = vswprintf(output_bufW, format, parms); + va_end(parms); + + /* Try to write as unicode all the time we think its a console */ + if (toConsole) { + res = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), + output_bufW, len, &nOut, NULL); + } + + /* If writing to console has failed (ever) we assume its file + i/o so convert to OEM codepage and output */ + if (!res) { + BOOL usedDefaultChar = FALSE; + DWORD convertedChars; + + toConsole = FALSE; + + /* + * Allocate buffer to use when writing to file. Not freed, as above + */ + if (!output_bufA) output_bufA = HeapAlloc(GetProcessHeap(), 0, + MAX_WRITECONSOLE_SIZE); + if (!output_bufA) { + WINE_FIXME("Out of memory - could not allocate 2 x 64K buffers\n"); + return 0; + } + + /* Convert to OEM, then output */ + convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, output_bufW, + len, output_bufA, MAX_WRITECONSOLE_SIZE, + "?", &usedDefaultChar); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), output_bufA, convertedChars, + &nOut, FALSE); + } + + /* Trace whether screen or console */ + if (!traceOutput) { + WINE_TRACE("Writing to console? (%d)\n", toConsole); + traceOutput = TRUE; + } + return nOut; +}

1 0

Rob Shearman : setupapi: SetupCopyOEMInfW should preserve the basename when copying the inf file to the inf directory if possible .
by Alexandre Julliard 02 May '07

02 May '07

Module: wine Branch: master Commit: b1030f59e69e89091bf997e52e831362f9077e69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1030f59e69e89091bf997e52… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 2 13:20:47 2007 +0100 setupapi: SetupCopyOEMInfW should preserve the basename when copying the inf file to the inf directory if possible. If the file already exists, then it should use a name with the form oem%u.inf instead. --- dlls/setupapi/misc.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index a9e1e82..b79c0e6 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -37,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); +/* arbitrary limit not related to what native actually uses */ +#define OEM_INDEX_LIMIT 999 /************************************************************************** * MyFree [SETUPAPI.@] @@ -926,7 +928,7 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, { BOOL ret = FALSE; WCHAR target[MAX_PATH], *p; - static const WCHAR inf_oem[] = { '\\','i','n','f','\\','O','E','M',0 }; + static const WCHAR inf[] = { '\\','i','n','f','\\',0 }; DWORD size; TRACE("%s, %s, %d, %d, %p, %d, %p, %p\n", debugstr_w(source), debugstr_w(location), @@ -947,10 +949,38 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, if (!GetWindowsDirectoryW( target, sizeof(target)/sizeof(WCHAR) )) return FALSE; - strcatW( target, inf_oem ); + strcatW( target, inf ); if ((p = strrchrW( source, '\\' ))) strcatW( target, p + 1 ); + /* does the file exist already? */ + if ((GetFileAttributesW( target ) != INVALID_FILE_ATTRIBUTES) && + !(style & SP_COPY_NOOVERWRITE)) + { + static const WCHAR oem[] = { 'o','e','m',0 }; + unsigned int i; + + p = strrchrW( target, '\\' ) + 1; + memcpy( p, oem, sizeof(oem) ); + p += sizeof(oem)/sizeof(oem[0]) - 1; + + /* generate OEMnnn.inf ending */ + for (i = 0; i < OEM_INDEX_LIMIT; i++) + { + static const WCHAR format[] = { '%','u','.','i','n','f',0 }; + wsprintfW( p, format, i ); + /* if we found a file name that doesn't exist then we're done */ + if (GetFileAttributesW( target ) == INVALID_FILE_ATTRIBUTES) + break; + } + + if (i == OEM_INDEX_LIMIT) + { + SetLastError( ERROR_FILENAME_EXCED_RANGE ); + return FALSE; + } + } + if (!(ret = CopyFileW( source, target, (style & SP_COPY_NOOVERWRITE) != 0 ))) return ret;

1 0

Andrew Talbot : dmime: Exclude unused headers.
by Alexandre Julliard 02 May '07

02 May '07

Module: wine Branch: master Commit: 150608ab912fdbed7de4fd68e08799f91a9ecbd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=150608ab912fdbed7de4fd68e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue May 1 22:13:41 2007 +0100 dmime: Exclude unused headers. --- dlls/dmime/dmutils.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index d61d7d6..f459283 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -31,9 +31,7 @@ #include "winuser.h" #include "wine/debug.h" -#include "wine/list.h" #include "wine/unicode.h" -#include "winreg.h" #include "objbase.h" #include "dmusici.h"

1 0

Laurent Vromman : gdi32: Complete WidenPath implementation.
by Alexandre Julliard 02 May '07

02 May '07

Module: wine Branch: master Commit: 8b837bf8cb19eb21e6ee9cb157e7ed64c241a053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b837bf8cb19eb21e6ee9cb15… Author: Laurent Vromman <laurent(a)vromman.org> Date: Wed May 2 00:30:31 2007 +0200 gdi32: Complete WidenPath implementation. WidenPath now recognizes PS_JOINs and PS_ENCDAPs. --- dlls/gdi32/path.c | 300 +++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 232 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b837bf8cb19eb21e6ee9…

1 0

Dmitry Timoshkov : comctl32: Remove a stray back slash.
by Alexandre Julliard 02 May '07

02 May '07

Module: wine Branch: master Commit: 19377e4ed63f6c15139b770c7aefb43ea047d7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19377e4ed63f6c15139b770c7… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 2 17:59:42 2007 +0900 comctl32: Remove a stray back slash. --- dlls/comctl32/tests/imagelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 8b7cd6a..3d4c333 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -892,7 +892,7 @@ static void image_list_init(HIMAGELIST himl) #define iml_clear_stream_data() \ HeapFree(GetProcessHeap(), 0, Test_Stream.iml_data); \ Test_Stream.iml_data = NULL; \ - Test_Stream.iml_data_size = 0; \ + Test_Stream.iml_data_size = 0; static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, INT width, INT height, INT bpp, const char *comment)

1 0