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

Michael Stefaniuc : oleview: Replace long with LONG.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: 693ccc2556981ef276eba7167bcbb161ce328a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=693ccc2556981ef276eba7167… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 11 21:28:07 2010 +0200 oleview: Replace long with LONG. --- programs/oleview/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 6ce96cf..7be31c9 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -916,7 +916,7 @@ static void AddPredefinitions(HTREEITEM hFirst, TYPELIB_DATA *pTLData) } static void CreateInterfaceInfo(ITypeInfo *pTypeInfo, int cImplTypes, WCHAR *wszName, - WCHAR *wszHelpString, unsigned long ulHelpContext, TYPEATTR *pTypeAttr, + WCHAR *wszHelpString, ULONG ulHelpContext, TYPEATTR *pTypeAttr, TYPELIB_DATA *pTLData) { ITypeInfo *pRefTypeInfo;

1 0

Michael Stefaniuc : secur32: Avoid using long.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: 24592a7a62d75ea342c5947f3f716be6bff2787b URL: http://source.winehq.org/git/wine.git/?a=commit;h=24592a7a62d75ea342c5947f3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 11 21:28:42 2010 +0200 secur32: Avoid using long. --- dlls/secur32/ntlm.c | 12 ++++++------ dlls/secur32/schannel.c | 4 ++-- dlls/secur32/secur32.c | 2 +- dlls/secur32/secur32_priv.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 0ef5b51..53de199 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -880,8 +880,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( else { TRACE("Negotiated %s\n", debugstr_a(buffer)); - sscanf(buffer + 3, "%lx", &(helper->neg_flags)); - TRACE("Stored 0x%08lx as flags\n", helper->neg_flags); + sscanf(buffer + 3, "%x", &(helper->neg_flags)); + TRACE("Stored 0x%08x as flags\n", helper->neg_flags); } TRACE("Getting session key\n"); @@ -1269,8 +1269,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( else { TRACE("Negotiated %s\n", debugstr_a(buffer)); - sscanf(buffer + 3, "%lx", &(helper->neg_flags)); - TRACE("Stored 0x%08lx as flags\n", helper->neg_flags); + sscanf(buffer + 3, "%x", &(helper->neg_flags)); + TRACE("Stored 0x%08x as flags\n", helper->neg_flags); } TRACE("Getting session key\n"); @@ -1631,7 +1631,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_MakeSignature(PCtxtHandle phContext, ULONG return SEC_E_BUFFER_TOO_SMALL; helper = (PNegoHelper)phContext->dwLower; - TRACE("Negotiated flags are: 0x%08lx\n", helper->neg_flags); + TRACE("Negotiated flags are: 0x%08x\n", helper->neg_flags); return ntlm_CreateSignature(helper, pMessage, token_idx, NTLM_SEND, TRUE); } @@ -1668,7 +1668,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext, FIXME("Ignoring MessageSeqNo\n"); helper = (PNegoHelper)phContext->dwLower; - TRACE("Negotiated flags: 0x%08lx\n", helper->neg_flags); + TRACE("Negotiated flags: 0x%08x\n", helper->neg_flags); local_buff = HeapAlloc(GetProcessHeap(), 0, pMessage->cBuffers * sizeof(SecBuffer)); diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 64e08b7..7a3bb3c 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1313,7 +1313,7 @@ void SECUR32_initSchannelSP(void) * even though the functions are missing, because the wrapper will * return SEC_E_UNSUPPORTED_FUNCTION if our function is NULL. */ - static const long caps = + static const LONG caps = SECPKG_FLAG_INTEGRITY | SECPKG_FLAG_PRIVACY | SECPKG_FLAG_CONNECTION | @@ -1323,7 +1323,7 @@ void SECUR32_initSchannelSP(void) SECPKG_FLAG_ACCEPT_WIN32_NAME | SECPKG_FLAG_STREAM; static const short version = 1; - static const long maxToken = 16384; + static const LONG maxToken = 16384; SEC_WCHAR *uniSPName = (SEC_WCHAR *)UNISP_NAME_W, *schannel = (SEC_WCHAR *)SCHANNEL_NAME_W; const SecPkgInfoW info[] = { diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index f626617..ae1326c 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -550,7 +550,7 @@ static const WCHAR securityProvidersW[] = { static void SECUR32_initializeProviders(void) { HKEY key; - long apiRet; + LSTATUS apiRet; TRACE("\n"); InitializeCriticalSection(&cs); diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index e2b0cd0..9f2ef8c 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -64,7 +64,7 @@ typedef struct _NegoHelper { int com_buf_size; int com_buf_offset; BYTE *session_key; - unsigned long neg_flags; + ULONG neg_flags; struct { struct { ULONG seq_num;

1 0

Thomas Mullaly : urlmon/tests: Fixed IUri tests so they fail gracefully on machines with IE <7.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: 92c48ef29a1b5d2e572bee0e15f5bc0dd57eea59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92c48ef29a1b5d2e572bee0e1… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue May 11 14:57:41 2010 -0400 urlmon/tests: Fixed IUri tests so they fail gracefully on machines with IE <7. --- dlls/urlmon/tests/uri.c | 58 ++++++++++++++++++++-------------------------- 1 files changed, 25 insertions(+), 33 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 1a7effb..13d69fc 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -36,30 +36,17 @@ #include "winbase.h" #include "urlmon.h" -/** TODO: Work on this! -typedef struct _uri_component_test_str { - const char* uri; - DWORD create_flags; - HRESULT create_hres; - DWORD property; - DWORD property_flags; - HRESULT property_hres; - const char* expected; -} uri_component_test_str; - -static const uri_component_test_str URI_STR_PARSE_ONLY_TESTS[] = { - {"http://www.winehq.org", Uri_CREATE_NO_CANONICALIZE, S_OK, Uri_PROPERTY_SCHEME_NAME, 0, S_OK, "http"}, - {"file://c:/test/test.mp3", Uri_CREATE_NO_CANONICALIZE, S_OK, Uri_PROPERTY_SCHEME_NAME, 0, S_OK, "file"} -}; -*/ +static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); +static const WCHAR http_urlW[] = { 'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q', + '.','o','r','g','/',0}; typedef struct _uri_create_flag_test { DWORD flags; HRESULT expected; } uri_create_flag_test; -static const uri_create_flag_test URI_INVALID_CREATE_FLAGS[] = { +static const uri_create_flag_test invalid_flag_tests[] = { /* Set of invalid flag combinations to test for. */ {Uri_CREATE_DECODE_EXTRA_INFO | Uri_CREATE_NO_DECODE_EXTRA_INFO, E_INVALIDARG}, {Uri_CREATE_CANONICALIZE | Uri_CREATE_NO_CANONICALIZE, E_INVALIDARG}, @@ -68,32 +55,37 @@ static const uri_create_flag_test URI_INVALID_CREATE_FLAGS[] = { {Uri_CREATE_IE_SETTINGS | Uri_CREATE_NO_IE_SETTINGS, E_INVALIDARG} }; -static void test_create_flags(LPCWSTR uriW, uri_create_flag_test test) { - HRESULT hr; - IUri *uri = NULL; - - hr = CreateUri(uriW, test.flags, 0, &uri); - ok(hr == test.expected, "Error: CreateUri returned 0x%08x, expected 0x%08x", hr, test.expected); - - if(uri) { IUri_Release(uri); } -} - /* * Simple tests to make sure the CreateUri function handles invalid flag combinations * correctly. */ static void test_CreateUri_InvalidFlags(void) { - static const WCHAR INVALID_URL[] = {'I','N','V','A','L','I','D',0}; DWORD i; - for(i = 0; i < sizeof(URI_INVALID_CREATE_FLAGS)/sizeof(URI_INVALID_CREATE_FLAGS[0]); ++i) { - test_create_flags(INVALID_URL, URI_INVALID_CREATE_FLAGS[i]); + for(i = 0; i < sizeof(invalid_flag_tests)/sizeof(invalid_flag_tests[0]); ++i) { + HRESULT hr; + IUri *uri = (void*) 0xdeadbeef; + + hr = pCreateUri(http_urlW, invalid_flag_tests[i].flags, 0, &uri); + todo_wine { + ok(hr == invalid_flag_tests[i].expected, "Error: CreateUri returned 0x%08x, expected 0x%08x, flags=0x%08x\n", + hr, invalid_flag_tests[i].expected, invalid_flag_tests[i].flags); + } + todo_wine { ok(uri == NULL, "Error: expected the IUri to be NULL, but it was %p instead\n", uri); } } } START_TEST(uri) { - todo_wine { - trace("test CreateUri invalid flags...\n"); - test_CreateUri_InvalidFlags(); + HMODULE hurlmon; + + hurlmon = GetModuleHandle("urlmon.dll"); + pCreateUri = (void*) GetProcAddress(hurlmon, "CreateUri"); + + if(!pCreateUri) { + win_skip("CreateUri is not present, skipping tests.\n"); + return; } + + trace("test CreateUri invalid flags...\n"); + test_CreateUri_InvalidFlags(); }

1 0

Damjan Jovanovic : winemenubuilder: Fix a char/ widechar typo in association .desktop paths.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: a432a7fbdb63554d522a9b386a9bab865e1b2b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a432a7fbdb63554d522a9b386… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 11 22:31:41 2010 +0200 winemenubuilder: Fix a char/widechar typo in association .desktop paths. --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 0797ec8..8f6e042 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1864,7 +1864,7 @@ static void update_association(LPCWSTR extension, LPCSTR mimeType, LPCWSTR progI RegSetValueExW(subkey, AppNameW, 0, REG_SZ, (const BYTE*) appNameW, (lstrlenW(appNameW) + 1) * sizeof(WCHAR)); if (docName) RegSetValueExW(subkey, DocNameW, 0, REG_SZ, (const BYTE*) docName, (lstrlenW(docName) + 1) * sizeof(WCHAR)); - RegSetValueExW(subkey, DesktopFileW, 0, REG_SZ, (const BYTE*) desktopFile, (lstrlenW(desktopFileW) + 1) * sizeof(WCHAR)); + RegSetValueExW(subkey, DesktopFileW, 0, REG_SZ, (const BYTE*) desktopFileW, (lstrlenW(desktopFileW) + 1) * sizeof(WCHAR)); done: RegCloseKey(assocKey);

1 0

Sven Baars : start: Update Dutch translation.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: d6b23f444dd5aafbf79e9ef97c06d45cf10a6b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6b23f444dd5aafbf79e9ef97… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue May 11 23:11:29 2010 +0200 start: Update Dutch translation. --- programs/start/Nl.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/start/Nl.rc b/programs/start/Nl.rc index 50252fa..318965f 100644 --- a/programs/start/Nl.rc +++ b/programs/start/Nl.rc @@ -27,16 +27,16 @@ STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL { STRING_USAGE, "Start een programma, of open een document met het programma dat normaal voor bestanden met die extensie gebruikt wordt.\n\ Gebruik:\n\ -start [options] programma_naam [...]\n\ -start [options] document_naam\n\ +start [opties] programma_naam [...]\n\ +start [opties] document_naam\n\ \n\ -Options:\n\ +Opties:\n\ /M[inimized] Start het programma geminimaliseerd.\n\ /MAX[imized] Start het programma gemaximaliseerd.\n\ /R[estored] Start het programma normaal (noch geminimaliseerd noch gemaximaliseerd).\n\ /W[ait] Wacht totdat het gestarte programma is be�indigd, eindig dan met de exit code van dat programma.\n\ -/Unix Gebruik een Unix bestandsnaam en start het bestand als de windows verkenner.\n\ -/ProgIDOpen Open a document using the following progID.\n\ +/Unix Gebruik een Unix bestandsnaam en start het bestand als de Windows verkenner.\n\ +/ProgIDOpen Open een document met behulp van het volgende progID.\n\ /L Laat de gebruikerslicentie zien.\n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ @@ -45,7 +45,7 @@ Dit is vrije software, en u wordt uitgenodigd om het verder te verspreiden\n\ onder bepaalde voorwaarden; draai 'start /L' voor details.\n\ " -STRING_LICENSE, "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ +STRING_LICENSE, "start.exe versie 0.2 Copyright (C) 2003, Dan Kegel\n\ This program is free software; you can redistribute it and/or\n\ modify it under the terms of the GNU Lesser Public License\n\ as published by the Free Software Foundation; either version 2.1\n\ @@ -60,7 +60,7 @@ You should have received a copy of the GNU Lesser Public License\n\ along with this program; if not, write to the Free Software\n\ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n\ \n\ -See the COPYING.LIB file for license information.\n\ +Bekijk het COPYING.LIB bestand voor informatie over de licentie.\n\ " STRING_EXECFAIL "Programma kan niet worden gestart, of er is geen programma verbonden met het opgegeven bestand.\nShellExecuteEx is mislukt"

1 0

Gerald Pfeifer : user32/tests: Make checks in test_LoadImageFile and test_LoadImage more comprehensive.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: 879328f3dabc64d7dcb37269f9949d42d588f829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=879328f3dabc64d7dcb37269f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue May 11 22:20:17 2010 +0200 user32/tests: Make checks in test_LoadImageFile and test_LoadImage more comprehensive. --- dlls/user32/tests/cursoricon.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index e68eaac..a7be34f 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -762,7 +762,7 @@ static void test_LoadImageFile(const unsigned char * image_data, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle != INVALID_HANDLE_VALUE, "CreateFileA failed. %u\n", GetLastError()); ret = WriteFile(handle, image_data, image_size, &bytes_written, NULL); - ok(bytes_written == image_size, "test file created improperly.\n"); + ok(ret && bytes_written == image_size, "test file created improperly.\n"); CloseHandle(handle); /* Load as cursor. For all tested formats, this should fail */ @@ -852,7 +852,7 @@ static void test_LoadImage(void) FILE_ATTRIBUTE_NORMAL, NULL); ok(handle != INVALID_HANDLE_VALUE, "CreateFileA failed. %u\n", GetLastError()); ret = WriteFile(handle, icon_data, ICON_SIZE, &bytes_written, NULL); - ok(bytes_written == ICON_SIZE, "icon.ico created improperly.\n"); + ok(ret && bytes_written == ICON_SIZE, "icon.ico created improperly.\n"); CloseHandle(handle); /* Test loading an icon as a cursor. */

1 0

Gerald Pfeifer : quartz: Remove unused variable pOutputPin from MPEGSplitter_process_sample.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: 5fd618a0cd3f1d0d2328c1c7b98123083e69c7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd618a0cd3f1d0d2328c1c7b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue May 11 22:30:28 2010 +0200 quartz: Remove unused variable pOutputPin from MPEGSplitter_process_sample. --- dlls/quartz/mpegsplit.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index e44a10f..7eb2d2c 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -246,11 +246,8 @@ static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample, BYTE *pbSrcStream; DWORD cbSrcStream = 0; REFERENCE_TIME tStart, tStop, tAviStart = This->position; - Parser_OutputPin * pOutputPin; HRESULT hr; - pOutputPin = (Parser_OutputPin*)This->Parser.ppPins[1]; - hr = IMediaSample_GetTime(pSample, &tStart, &tStop); if (SUCCEEDED(hr)) {

1 0

André Hentschel : winemaker: Add missing linefeed.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: 1a8fdf07b40fbfbbc03e07b06453c61200752ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a8fdf07b40fbfbbc03e07b06… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 11 20:03:04 2010 +0200 winemaker: Add missing linefeed. --- tools/winemaker | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 4bd42a4..48e7bde 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1354,7 +1354,7 @@ sub source_scan_directory($$$$) # Try to come up with a target list based on .dsp/.mak files my $prj_list; if (@prj_files > 0) { - print "Projectfile found! You might want to try using it directly."; + print "Projectfile found! You might want to try using it directly.\n"; $prj_list=\@prj_files; } else { $prj_list=\@mak_files;

1 0

Aurimas Fišeras : wordpad: Update Lithuanian translation.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: 246aa6385a2dc91ca877f80b7e9d65890fbcc129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=246aa6385a2dc91ca877f80b7… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue May 11 21:13:03 2010 +0300 wordpad: Update Lithuanian translation. --- programs/wordpad/Lt.rc | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/wordpad/Lt.rc b/programs/wordpad/Lt.rc index c9f2571..f9cd88f 100644 --- a/programs/wordpad/Lt.rc +++ b/programs/wordpad/Lt.rc @@ -250,11 +250,10 @@ BEGIN STRING_PREVIEW_CLOSE, "Užverti" STRING_PREVIEW_PAGE, "Puslapis" STRING_PREVIEW_PAGES, "Puslapiai" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "cm" + STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "col." + STRING_UNITS_INCH, "coliai" + STRING_UNITS_PT, "tašk." END STRINGTABLE DISCARDABLE

1 0

Sven Baars : wordpad: Update Dutch translation.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: 32b821d0579f389964a9827b26051148d8d9f148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32b821d0579f389964a9827b2… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue May 11 20:35:19 2010 +0200 wordpad: Update Dutch translation. --- programs/wordpad/Nl.rc | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index b38a325..010f53b 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -242,11 +242,10 @@ BEGIN STRING_PREVIEW_CLOSE, "Sluiten" STRING_PREVIEW_PAGE, "Pagina" STRING_PREVIEW_PAGES, "Pagina's" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "cm" + STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "inch" + STRING_UNITS_PT, "pt" END STRINGTABLE DISCARDABLE

1 0