October 2013 - Wine-Commits

André Hentschel : oleaut32/tests: Fix vartest tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: ca469de6568cd9a8e92b5a54da0d534d5c2b21af URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca469de6568cd9a8e92b5a54d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 23:34:22 2013 +0200 oleaut32/tests: Fix vartest tests compilation with __WINESRC__ defined. --- dlls/oleaut32/tests/Makefile.in | 1 - dlls/oleaut32/tests/vartest.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/Makefile.in b/dlls/oleaut32/tests/Makefile.in index 5620411..e47e2fe 100644 --- a/dlls/oleaut32/tests/Makefile.in +++ b/dlls/oleaut32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = oleaut32.dll IMPORTS = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ dispatch.c \ diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 2840f47..a91eb7e 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -28,7 +28,7 @@ #include "windef.h" #include "winbase.h" -#include "winsock.h" +#include "winsock2.h" #include "wine/test.h" #include "winuser.h" #include "wingdi.h" @@ -116,7 +116,7 @@ static void init(void) if (bstr) memcpy(&sz12_false[2], bstr, SysStringByteLen(bstr) + sizeof(WCHAR)); SysFreeString(bstr); - hOleaut32 = GetModuleHandle("oleaut32.dll"); + hOleaut32 = GetModuleHandleA("oleaut32.dll"); has_i8 = GetProcAddress(hOleaut32, "VarI8FromI1") != NULL; if (!has_i8) skip("No support for I8 and UI8 data types\n"); @@ -5366,7 +5366,7 @@ static void test_VarCat(void) static const WCHAR sz12_date[] = {'1','2','9','/','3','0','/','1','9','8','0','\0'}; static const WCHAR sz12_date_broken[] = {'1','2','9','/','3','0','/','8','0','\0'}; static const WCHAR sz_empty[] = {'\0'}; - TCHAR orig_date_format[128]; + CHAR orig_date_format[128]; VARTYPE leftvt, rightvt, resultvt; HRESULT hres; HRESULT expected_error_num; @@ -5375,8 +5375,8 @@ static void test_VarCat(void) /* Set date format for testing */ lcid = LOCALE_USER_DEFAULT; - GetLocaleInfo(lcid,LOCALE_SSHORTDATE,orig_date_format,128); - SetLocaleInfo(lcid,LOCALE_SSHORTDATE,"M/d/yyyy"); + GetLocaleInfoA(lcid,LOCALE_SSHORTDATE,orig_date_format,128); + SetLocaleInfoA(lcid,LOCALE_SSHORTDATE,"M/d/yyyy"); VariantInit(&left); VariantInit(&right); @@ -5697,7 +5697,7 @@ static void test_VarCat(void) "VarCat: EMPTY concat with EMPTY did not return empty VT_BSTR\n"); /* Restore original date format settings */ - SetLocaleInfo(lcid,LOCALE_SSHORTDATE,orig_date_format); + SetLocaleInfoA(lcid,LOCALE_SSHORTDATE,orig_date_format); VariantClear(&left); VariantClear(&right);

1 0

André Hentschel : oleaut32/tests: Fix typelib tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 611ad497e728e71c6051e98c1a46780a79001740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=611ad497e728e71c6051e98c1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 23:28:42 2013 +0200 oleaut32/tests: Fix typelib tests compilation with __WINESRC__ defined. --- dlls/oleaut32/tests/typelib.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 613a27d..9397fe3 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -44,7 +44,7 @@ { \ CHAR buf[260]; \ expect_eq(!WideCharToMultiByte(CP_ACP, 0, (expr), -1, buf, 260, NULL, NULL), 0, int, "%d"); \ - ok(lstrcmp(value, buf) == 0, #expr " expected \"%s\" got \"%s\"\n", value, buf); \ + ok(strcmp(value, buf) == 0, #expr " expected \"%s\" got \"%s\"\n", value, buf); \ } #define ole_expect(expr, expect) { \ @@ -628,14 +628,14 @@ static void write_typelib(int res_no, const char *filename) HRSRC res; void *ptr; - file = CreateFile( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + file = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); ok( file != INVALID_HANDLE_VALUE, "file creation failed\n" ); if (file == INVALID_HANDLE_VALUE) return; - res = FindResource( GetModuleHandle(0), MAKEINTRESOURCE(res_no), "TYPELIB" ); + res = FindResourceA( GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(res_no), "TYPELIB" ); ok( res != 0, "couldn't find resource\n" ); - ptr = LockResource( LoadResource( GetModuleHandle(0), res )); - WriteFile( file, ptr, SizeofResource( GetModuleHandle(0), res ), &written, NULL ); - ok( written == SizeofResource( GetModuleHandle(0), res ), "couldn't write resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); CloseHandle( file ); } @@ -5221,7 +5221,7 @@ START_TEST(typelib) if ((filename = create_test_typelib(2))) { test_dump_typelib( filename ); - DeleteFile( filename ); + DeleteFileA( filename ); } test_register_typelib(TRUE);

1 0

André Hentschel : oleaut32/tests: Fix tmarshal tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 54b883ef61b1cef90c889b4bc061dbb575ed8ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b883ef61b1cef90c889b4bc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 23:27:35 2013 +0200 oleaut32/tests: Fix tmarshal tests compilation with __WINESRC__ defined. --- dlls/oleaut32/tests/tmarshal.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 357bd2e..d493327 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -80,11 +80,11 @@ static DWORD CALLBACK host_object_proc(LPVOID p) ok_ole_success(hr, CoMarshalInterface); /* force the message queue to be created before signaling parent thread */ - PeekMessage(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + PeekMessageA(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); SetEvent(data->marshal_event); - while (GetMessage(&msg, NULL, 0, 0)) + while (GetMessageA(&msg, NULL, 0, 0)) { if (msg.hwnd == NULL && msg.message == RELEASEMARSHALDATA) { @@ -93,7 +93,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) SetEvent((HANDLE)msg.lParam); } else - DispatchMessage(&msg); + DispatchMessageA(&msg); } HeapFree(GetProcessHeap(), 0, data); @@ -106,7 +106,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) static DWORD start_host_object2(IStream *stream, REFIID riid, IUnknown *object, MSHLFLAGS marshal_flags, IMessageFilter *filter, HANDLE *thread) { DWORD tid = 0; - HANDLE marshal_event = CreateEvent(NULL, FALSE, FALSE, NULL); + HANDLE marshal_event = CreateEventA(NULL, FALSE, FALSE, NULL); struct host_object_data *data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)); data->stream = stream; @@ -135,8 +135,8 @@ static DWORD start_host_object(IStream *stream, REFIID riid, IUnknown *object, M * same thread that marshaled the interface in the first place. */ static void release_host_object(DWORD tid) { - HANDLE event = CreateEvent(NULL, FALSE, FALSE, NULL); - PostThreadMessage(tid, RELEASEMARSHALDATA, 0, (LPARAM)event); + HANDLE event = CreateEventA(NULL, FALSE, FALSE, NULL); + PostThreadMessageA(tid, RELEASEMARSHALDATA, 0, (LPARAM)event); WaitForSingleObject(event, INFINITE); CloseHandle(event); } @@ -144,7 +144,7 @@ static void release_host_object(DWORD tid) static void end_host_object(DWORD tid, HANDLE thread) { - BOOL ret = PostThreadMessage(tid, WM_QUIT, 0, 0); + BOOL ret = PostThreadMessageA(tid, WM_QUIT, 0, 0); ok(ret, "PostThreadMessage failed with error %d\n", GetLastError()); /* be careful of races - don't return until hosting thread has terminated */ WaitForSingleObject(thread, INFINITE);

1 0

André Hentschel : oleaut32/tests: Fix safearray tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 5cf89fd5ad1786c12ace01575bca1a3ca3514481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cf89fd5ad1786c12ace01575… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 23:25:43 2013 +0200 oleaut32/tests: Fix safearray tests compilation with __WINESRC__ defined. --- dlls/oleaut32/tests/safearray.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 469bdef..faec23e 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -32,7 +32,7 @@ #include "winuser.h" #include "wingdi.h" #include "winnls.h" -#include "winsock.h" +#include "winsock2.h" #include "winerror.h" #include "winnt.h" @@ -1749,7 +1749,7 @@ static void test_SafeArrayDestroyData (void) HRESULT hres; int value = 0xdeadbeef; LONG index[1]; - void HUGEP *temp_pvData; + void *temp_pvData; sab.lLbound = 0; sab.cElements = 10;

1 0

André Hentschel : oleaut32/tests: Fix varformat tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 03f627096eeb56219d1c3cb723f17de05adba4f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f627096eeb56219d1c3cb72… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 23:30:29 2013 +0200 oleaut32/tests: Fix varformat tests compilation with __WINESRC__ defined. --- dlls/oleaut32/tests/varformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 8370d1d..216acc6 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -26,7 +26,7 @@ #include "windef.h" #include "winbase.h" -#include "winsock.h" +#include "winsock2.h" #include "wine/test.h" #include "winuser.h" #include "wingdi.h"

1 0

André Hentschel : oleaut32/tests: Fix olepicture tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 320a3f7e7d0cfe5a24badf589257eff38527a067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=320a3f7e7d0cfe5a24badf589… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 23:25:25 2013 +0200 oleaut32/tests: Fix olepicture tests compilation with __WINESRC__ defined. --- dlls/oleaut32/tests/olepicture.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index db10baa..de37322 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -220,7 +220,7 @@ test_pic_with_stream(LPSTREAM stream, unsigned int imgsize) if (handle) { BITMAP bmp; - GetObject(UlongToHandle(handle), sizeof(BITMAP), &bmp); + GetObjectA(UlongToHandle(handle), sizeof(BITMAP), &bmp); todo_wine ok(bmp.bmBits != 0, "not a dib\n"); } @@ -640,7 +640,7 @@ static void test_Render(void) desc.cbSizeofstruct = sizeof(PICTDESC); desc.picType = PICTYPE_ICON; - desc.u.icon.hicon = LoadIcon(NULL, IDI_APPLICATION); + desc.u.icon.hicon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); if(!desc.u.icon.hicon){ win_skip("LoadIcon failed. Skipping...\n"); ReleaseDC(NULL, hdc); @@ -1020,7 +1020,7 @@ static void test_load_save_icon(void) desc.cbSizeofstruct = sizeof(desc); desc.picType = PICTYPE_ICON; - desc.u.icon.hicon = LoadIcon(0, IDI_APPLICATION); + desc.u.icon.hicon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); ok(hr == S_OK, "OleCreatePictureIndirect error %#x\n", hr);

1 0

André Hentschel : oleaut32/tests: Fix olefont tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 1f31eb42cc8b1ef68aee8c232e91a51b84832b5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f31eb42cc8b1ef68aee8c232… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 23:24:37 2013 +0200 oleaut32/tests: Fix olefont tests compilation with __WINESRC__ defined. --- dlls/oleaut32/tests/olefont.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 9761778..1af1b6d 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -66,7 +66,7 @@ static void test_ifont_size(LONG lo_size, LONG hi_size, LPVOID pvObj = NULL; IFont* ifnt = NULL; HFONT hfont; - LOGFONT lf; + LOGFONTA lf; CY psize; HRESULT hres; DWORD rtnval; @@ -110,7 +110,7 @@ static void test_ifont_size(LONG lo_size, LONG hi_size, hres = IFont_get_hFont (ifnt, &hfont); ok(hres == S_OK, "%s: IFont_get_hFont returns 0x%08x instead of S_OK.\n", test_name, hres); - rtnval = GetObject (hfont, sizeof(LOGFONT), &lf); + rtnval = GetObjectA(hfont, sizeof(LOGFONTA), &lf); ok(rtnval > 0, "GetObject(hfont) failed\n"); /* Since font scaling may encounter rounding errors, allow 1 pixel deviation. */

1 0

Marcus Meissner : xmllite: Annotate fallthrough case (Coverity).
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 468be8b9d25bbbb75bbe722f58de43b65f49b73f URL: http://source.winehq.org/git/wine.git/?a=commit;h=468be8b9d25bbbb75bbe722f5… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 26 11:16:37 2013 +0200 xmllite: Annotate fallthrough case (Coverity). --- dlls/xmllite/reader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 6d5c99b..dffe226 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1501,6 +1501,7 @@ static HRESULT reader_parse_whitespace(xmlreader *reader) reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &strval_empty); + /* fallthrough */ case XmlReadResumeState_Whitespace: { strval value;

1 0

André Hentschel : Wine 1.7.5 freigegeben
by Jeremy Newman Oct. 28, 2013

Oct. 28, 2013

Module: website Branch: master Commit: 4027f6427e341cc5d2f95b86ed7109ffbd02e211 URL: http://source.winehq.org/git/website.git/?a=commit;h=4027f6427e341cc5d2f95b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 27 14:44:52 2013 +0100 Wine 1.7.5 freigegeben --- news/de/2013102501.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2013102501.xml b/news/de/2013102501.xml new file mode 100644 index 0000000..80cd1b5 --- /dev/null +++ b/news/de/2013102501.xml @@ -0,0 +1,16 @@ +<news> +<date>25. Oktober 2013</date> +<title>Wine 1.7.5 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für registrierungsfreies COM mit Activation Contexts.</li> + <li>Verbesserte Unterstützung für simulierte fett gedruckte Schriften.</li> + <li>Unicode Daten wurden auf Unicode 6.3 geupdatet.</li> + <li>Bessere Unterstützung für Typelib Registrierung unter 64-Bit.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.5.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.5
by Jeremy Newman Oct. 28, 2013

Oct. 28, 2013

Module: website Branch: master Commit: d3b40f350bc9039997521b71bc8842070d2ba2b8 URL: http://source.winehq.org/git/website.git/?a=commit;h=d3b40f350bc9039997521b… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Oct 25 20:21:47 2013 +0200 Polish translation for release 1.7.5 --- news/pl/2013102501.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pl/2013102501.xml b/news/pl/2013102501.xml new file mode 100644 index 0000000..0d5fcd5 --- /dev/null +++ b/news/pl/2013102501.xml @@ -0,0 +1,16 @@ +<news> +<date>Październik 25, 2013</date> +<title>Wydano Wine 1.7.5</title> +<body> + Wydanie rozwojowe Wine 1.7.5 jest już dostępne. + <a href="{$root}/announce/1.7.5">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla wolnych od rejestracji komponentów COM przy użyciu kontekstów aktywacji.</li> + <li>Ulepszone wsparcie dla wytłuszczania czcionek metodą symulowania.</li> + <li>Uaktualniono dane Unicode do Unicode 6.3.</li> + <li>Lepsze wsparcie dla rejestracji bibliotek typelib na 64-bitach.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.5.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0