January 2014 - Wine-Commits

Bruno Jesus : include: Add NLA_BLOB structure and its dependencies in mswsock.h.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 4712f361a95d7e0fa66dc2445d73678d039a6646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4712f361a95d7e0fa66dc2445… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 4 03:25:28 2014 -0200 include: Add NLA_BLOB structure and its dependencies in mswsock.h. --- include/mswsock.h | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/include/mswsock.h b/include/mswsock.h index 3e41345..3f0180c 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -164,6 +164,75 @@ typedef struct _WSACMSGHDR { /* followed by UCHAR cmsg_data[] */ } WSACMSGHDR, *PWSACMSGHDR, *LPWSACMSGHDR; +typedef enum _NLA_BLOB_DATA_TYPE { + NLA_RAW_DATA, + NLA_INTERFACE, /* interface name, type and speed */ + NLA_802_1X_LOCATION, /* wireless network info */ + NLA_CONNECTIVITY, /* status on network connectivity */ + NLA_ICS /* internet connection sharing */ +} NLA_BLOB_DATA_TYPE; + +typedef enum _NLA_CONNECTIVITY_TYPE { + NLA_NETWORK_AD_HOC, /* private network */ + NLA_NETWORK_MANAGED, /* network managed by domain */ + NLA_NETWORK_UNMANAGED, + NLA_NETWORK_UNKNOWN +} NLA_CONNECTIVITY_TYPE; + +typedef enum _NLA_INTERNET { + NLA_INTERNET_UNKNOWN, /* can't determine if connected or not */ + NLA_INTERNET_NO, /* not connected to internet */ + NLA_INTERNET_YES /* connected to internet */ +} NLA_INTERNET; + +/* this structure is returned in the lpBlob field during calls to WSALookupServiceNext */ +typedef struct _NLA_BLOB { + /* the header defines the size of the current record and if there is a next record */ + struct { + NLA_BLOB_DATA_TYPE type; + DWORD dwSize; + DWORD nextOffset; /* if it's zero there are no more blobs */ + } header; + + /* the following union interpretation depends on the header.type value + * from the struct above. + * the header.dwSize will be the size of all data, specially useful when + * the last struct field is size [1] */ + union { + /* NLA_RAW_DATA */ + CHAR rawData[1]; + + /* NLA_INTERFACE */ + struct { + DWORD dwType; + DWORD dwSpeed; + CHAR adapterName[1]; + } interfaceData; + + /* NLA_802_1X_LOCATION */ + struct { + CHAR information[1]; + } locationData; + + /* NLA_CONNECTIVITY */ + struct { + NLA_CONNECTIVITY_TYPE type; + NLA_INTERNET internet; + } connectivity; + + /* NLA_ICS */ + struct { + struct { + DWORD speed; + DWORD type; + DWORD state; + WCHAR machineName[256]; + WCHAR sharedAdapterName[256]; + } remote; + } ICS; + } data; +} NLA_BLOB, *PNLA_BLOB; + typedef BOOL (WINAPI * LPFN_ACCEPTEX)(SOCKET, SOCKET, PVOID, DWORD, DWORD, DWORD, LPDWORD, LPOVERLAPPED); typedef BOOL (WINAPI * LPFN_CONNECTEX)(SOCKET, const struct WS(sockaddr) *, int, PVOID, DWORD, LPDWORD, LPOVERLAPPED); typedef BOOL (WINAPI * LPFN_DISCONNECTEX)(SOCKET, LPOVERLAPPED, DWORD, DWORD);

1 0

Alexandre Julliard : configure: Don't allow overriding INSTALL.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 205003f9c09b49e56f4f9df15fe53492d0d8bd7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=205003f9c09b49e56f4f9df15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 4 19:35:00 2014 +0100 configure: Don't allow overriding INSTALL. --- Make.vars.in | 7 +++---- configure | 14 -------------- configure.ac | 7 ------- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 15ef9c0..6bec6979 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -70,10 +70,9 @@ CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc -B$(TOOLSDIR)/tools/winebuil SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' LDRPATH_INSTALL = @LDRPATH_INSTALL@ LDRPATH_LOCAL = @LDRPATH_LOCAL@ -INSTALL = @INSTALL@ $(INSTALL_FLAGS) -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(INSTALL_PROGRAM_FLAGS) -INSTALL_SCRIPT = @INSTALL_SCRIPT@ $(INSTALL_SCRIPT_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ $(INSTALL_DATA_FLAGS) +INSTALL_PROGRAM = STRIPPROG="$(STRIP)" $(top_srcdir)/tools/install-sh $(INSTALL_PROGRAM_FLAGS) +INSTALL_SCRIPT = $(top_srcdir)/tools/install-sh $(INSTALL_SCRIPT_FLAGS) +INSTALL_DATA = $(top_srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS) CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c prog_manext = 1 api_manext = 3w diff --git a/configure b/configure index b4dfb47..4603d95 100755 --- a/configure +++ b/configure @@ -719,10 +719,6 @@ RSVG FONTFORGE PKG_CONFIG MSGFMT -INSTALL_DATA -INSTALL_SCRIPT -INSTALL_PROGRAM -INSTALL LDCONFIG MKDIR_P EGREP @@ -5443,16 +5439,6 @@ $as_echo "no" >&6; } fi - -test -z "$INSTALL" && INSTALL="\$(top_srcdir)/tools/install-sh" - -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="STRIPPROG=\"\$(STRIP)\" \$(INSTALL)" - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT="\$(INSTALL)" - -test -z "$INSTALL_DATA" && INSTALL_DATA="\$(INSTALL) -m 644" - - for ac_prog in msgfmt do # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/configure.ac b/configure.ac index 3c1101c..eb780fa 100644 --- a/configure.ac +++ b/configure.ac @@ -266,13 +266,6 @@ AC_PROG_LN_S AC_PROG_EGREP AC_PROG_MKDIR_P AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH]) - -dnl Use the correct strip to install programs -test -z "$INSTALL" && AC_SUBST([INSTALL],"\$(top_srcdir)/tools/install-sh") -test -z "$INSTALL_PROGRAM" && AC_SUBST([INSTALL_PROGRAM],"STRIPPROG=\"\$(STRIP)\" \$(INSTALL)") -test -z "$INSTALL_SCRIPT" && AC_SUBST([INSTALL_SCRIPT],"\$(INSTALL)") -test -z "$INSTALL_DATA" && AC_SUBST([INSTALL_DATA],"\$(INSTALL) -m 644") - AC_CHECK_PROGS(MSGFMT, msgfmt, false) WINE_PATH_PKG_CONFIG

1 0

Michael Stefaniuc : dmusic: Don't crash on NULL in IDirectMusicObject:: GetDescriptor.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: fe0d2a2ba796dc0551cef08098a42a405738b421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe0d2a2ba796dc0551cef0809… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 5 23:51:17 2014 +0100 dmusic: Don't crash on NULL in IDirectMusicObject::GetDescriptor. --- dlls/dmusic/collection.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index a519b2a..4c6a034 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -181,7 +181,9 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_GetDescripto TRACE("(%p/%p)->(%p)\n", iface, This, pDesc); - /* I think we shouldn't return pointer here since then values can be changed; it'd be a mess */ + if (!pDesc) + return E_POINTER; + memcpy (pDesc, This->pDesc, This->pDesc->dwSize); return S_OK;

1 0

Bruno Jesus : ws2_32/tests: Add some WSALookupService[Begin|Next|End] tests .
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: b461fa4468168b973fc446ccd014e62aef67459a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b461fa4468168b973fc446ccd… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 4 03:25:43 2014 -0200 ws2_32/tests: Add some WSALookupService[Begin|Next|End] tests. --- dlls/ws2_32/tests/sock.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 168 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3c09974..54b0840 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -67,6 +67,9 @@ static int (WINAPI *pgetaddrinfo)(LPCSTR,LPCSTR,const struct addrinfo *,struct static void (WINAPI *pFreeAddrInfoW)(PADDRINFOW); static int (WINAPI *pGetAddrInfoW)(LPCWSTR,LPCWSTR,const ADDRINFOW *,PADDRINFOW *); static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG); +static int (WINAPI *pWSALookupServiceBeginW)(LPWSAQUERYSETW,DWORD,LPHANDLE); +static int (WINAPI *pWSALookupServiceEnd)(HANDLE); +static int (WINAPI *pWSALookupServiceNextW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW); /**************** Structs and typedefs ***************/ @@ -1047,6 +1050,9 @@ static void Init (void) pFreeAddrInfoW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoW"); pGetAddrInfoW = (void *)GetProcAddress(hws2_32, "GetAddrInfoW"); pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); + pWSALookupServiceBeginW = (void *)GetProcAddress(hws2_32, "WSALookupServiceBeginW"); + pWSALookupServiceEnd = (void *)GetProcAddress(hws2_32, "WSALookupServiceEnd"); + pWSALookupServiceNextW = (void *)GetProcAddress(hws2_32, "WSALookupServiceNextW"); ok ( WSAStartup ( ver, &data ) == 0, "WSAStartup failed\n" ); tls = TlsAlloc(); @@ -7286,6 +7292,166 @@ static void test_inet_ntoa(void) CloseHandle(thread); } +static void test_WSALookupService(void) +{ + char buffer[4096], strbuff[128]; + WSAQUERYSETW *qs = NULL; + HANDLE hnd; + PNLA_BLOB netdata; + int ret; + DWORD error, offset, bsize; + + if (!pWSALookupServiceBeginW || !pWSALookupServiceEnd || !pWSALookupServiceNextW) + { + win_skip("WSALookupServiceBeginW or WSALookupServiceEnd or WSALookupServiceNextW not found"); + return; + } + + qs = (WSAQUERYSETW *)buffer; + memset(qs, 0, sizeof(*qs)); + + /* invalid parameter tests */ + ret = pWSALookupServiceBeginW(NULL, 0, &hnd); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); +todo_wine + ok(error == WSAEFAULT, "expected 10014, got %d\n", error); + + ret = pWSALookupServiceBeginW(qs, 0, NULL); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); +todo_wine + ok(error == WSAEFAULT, "expected 10014, got %d\n", error); + + ret = pWSALookupServiceBeginW(qs, 0, &hnd); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); +todo_wine + ok(error == WSAEINVAL + || broken(error == ERROR_INVALID_PARAMETER) /* <= XP */ + || broken(error == WSASERVICE_NOT_FOUND) /* == 2000 */, + "expected 10022, got %d\n", error); + + ret = pWSALookupServiceEnd(NULL); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "WSALookupServiceEnd should have failed\n"); +todo_wine + ok(error == ERROR_INVALID_HANDLE, "expected 6, got %d\n", error); + + /* standard network list query */ + qs->dwSize = sizeof(*qs); + hnd = (HANDLE)0xdeadbeef; + ret = pWSALookupServiceBeginW(qs, LUP_RETURN_ALL | LUP_DEEP, &hnd); + error = WSAGetLastError(); + if(ret && error == ERROR_INVALID_PARAMETER) + { + win_skip("the current WSALookupServiceBeginW test is not supported in win 2000\n"); + return; + } + +todo_wine + ok(!ret, "WSALookupServiceBeginW failed unexpectedly with error %d\n", error); +todo_wine + ok(hnd != (HANDLE)0xdeadbeef, "Handle was not filled\n"); + + offset = 0; + do + { + memset(qs, 0, sizeof(*qs)); + bsize = sizeof(buffer); + + if (pWSALookupServiceNextW(hnd, 0, &bsize, qs) == SOCKET_ERROR) + { + error = WSAGetLastError(); + if (error == WSA_E_NO_MORE) break; + ok(0, "Error %d happened while listing services\n", error); + break; + } + + WideCharToMultiByte(CP_ACP, 0, qs->lpszServiceInstanceName, -1, + strbuff, sizeof(strbuff), NULL, NULL); + trace("Network Name: %s\n", strbuff); + + /* network data is written in the blob field */ + if (qs->lpBlob) + { + /* each network may have multiple NLA_BLOB information structures */ + do + { + netdata = (PNLA_BLOB) &qs->lpBlob->pBlobData[offset]; + switch (netdata->header.type) + { + case NLA_RAW_DATA: + trace("\tNLA Data Type: NLA_RAW_DATA\n"); + break; + case NLA_INTERFACE: + trace("\tNLA Data Type: NLA_INTERFACE\n"); + trace("\t\tType: %d\n", netdata->data.interfaceData.dwType); + trace("\t\tSpeed: %d\n", netdata->data.interfaceData.dwSpeed); + trace("\t\tAdapter Name: %s\n", netdata->data.interfaceData.adapterName); + break; + case NLA_802_1X_LOCATION: + trace("\tNLA Data Type: NLA_802_1X_LOCATION\n"); + trace("\t\tInformation: %s\n", netdata->data.locationData.information); + break; + case NLA_CONNECTIVITY: + switch (netdata->data.connectivity.type) + { + case NLA_NETWORK_AD_HOC: + trace("\t\tNetwork Type: AD HOC\n"); + break; + case NLA_NETWORK_MANAGED: + trace("\t\tNetwork Type: Managed\n"); + break; + case NLA_NETWORK_UNMANAGED: + trace("\t\tNetwork Type: Unmanaged\n"); + break; + case NLA_NETWORK_UNKNOWN: + trace("\t\tNetwork Type: Unknown\n"); + } + switch (netdata->data.connectivity.internet) + { + case NLA_INTERNET_NO: + trace("\t\tInternet connectivity: No\n"); + break; + case NLA_INTERNET_YES: + trace("\t\tInternet connectivity: Yes\n"); + break; + case NLA_INTERNET_UNKNOWN: + trace("\t\tInternet connectivity: Unknown\n"); + break; + } + break; + case NLA_ICS: + trace("\tNLA Data Type: NLA_ICS\n"); + trace("\t\tSpeed: %d\n", + netdata->data.ICS.remote.speed); + trace("\t\tType: %d\n", + netdata->data.ICS.remote.type); + trace("\t\tState: %d\n", + netdata->data.ICS.remote.state); + WideCharToMultiByte(CP_ACP, 0, netdata->data.ICS.remote.machineName, -1, + strbuff, sizeof(strbuff), NULL, NULL); + trace("\t\tMachine Name: %s\n", strbuff); + WideCharToMultiByte(CP_ACP, 0, netdata->data.ICS.remote.sharedAdapterName, -1, + strbuff, sizeof(strbuff), NULL, NULL); + trace("\t\tShared Adapter Name: %s\n", strbuff); + break; + default: + trace("\tNLA Data Type: Unknown\n"); + break; + } + } + while (offset); + } + } + while (1); + + ret = pWSALookupServiceEnd(hnd); + ok(!ret, "WSALookupServiceEnd failed unexpectedly\n"); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -7351,6 +7517,8 @@ START_TEST( sock ) test_sioRoutingInterfaceQuery(); + test_WSALookupService(); + test_WSAAsyncGetServByPort(); test_WSAAsyncGetServByName();

1 0

Vincent Povirk : gdiplus: Mark the Graphics object as busy before freeing it.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 51b873b3ca03074698ab027f503acd7c1940ad80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b873b3ca03074698ab027f5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jan 3 14:00:10 2014 -0600 gdiplus: Mark the Graphics object as busy before freeing it. --- dlls/gdiplus/graphics.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 122581d..7f892f6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2409,6 +2409,12 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) } GdipDeleteRegion(graphics->clip); + + /* Native returns ObjectBusy on the second free, instead of crashing as we'd + * do otherwise, but we can't have that in the test suite because it means + * accessing freed memory. */ + graphics->busy = TRUE; + GdipFree(graphics); return Ok;

1 0

Bruno Jesus : include: Add some LUP_* definitions to winsock2.h.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 000328421a00216de16ea68f660428a878c22f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=000328421a00216de16ea68f6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 4 03:25:19 2014 -0200 include: Add some LUP_* definitions to winsock2.h. --- include/winsock2.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/winsock2.h b/include/winsock2.h index c4e013b..f189f79 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -195,6 +195,18 @@ extern "C" { #define JL_RECEIVER_ONLY 0x02 #define JL_BOTH 0x04 +/* Constants for WSALookupServiceBegin() */ +#define LUP_DEEP 0x0001 +#define LUP_RETURN_NAME 0x0010 +#define LUP_RETURN_TYPE 0x0020 +#define LUP_RETURN_VERSION 0x0040 +#define LUP_RETURN_COMMENT 0x0080 +#define LUP_RETURN_ADDR 0x0100 +#define LUP_RETURN_BLOB 0x0200 +#define LUP_RETURN_ALIASES 0x0400 +#define LUP_RETURN_QUERY_STRING 0x0800 +#define LUP_RETURN_ALL (LUP_RETURN_ADDR|LUP_RETURN_BLOB|LUP_RETURN_ALIASES|LUP_RETURN_QUERY_STRING \ + |LUP_RETURN_NAME|LUP_RETURN_TYPE|LUP_RETURN_VERSION|LUP_RETURN_COMMENT) #ifndef GUID_DEFINED #include <guiddef.h>

1 0

Marcus Meissner : website: update opensuse versions
by Jeremy Newman Jan. 6, 2014

Jan. 6, 2014

Module: website Branch: master Commit: ec758cad80db5833882499e4e4fdb8815b021fb0 URL: http://source.winehq.org/git/website.git/?a=commit;h=ec758cad80db5833882499… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Jan 6 13:15:54 2014 +0100 website: update opensuse versions --- templates/de/download.template | 2 +- templates/en/download.template | 2 +- templates/fr/download.template | 4 +--- templates/he/download.template | 3 +-- templates/pl/download.template | 3 +-- templates/pt/download.template | 3 +-- templates/tr/download.template | 3 +-- templates/uk/download.template | 2 +- templates/zh-cn/download.template | 2 +- 9 files changed, 9 insertions(+), 15 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index d0cbd21..b2d0040 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -94,7 +94,7 @@ erbeten hat, dass sie die Wine-Website hosten.</p> <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE</a></b> - stellt binär und Quellcode .rpms und tägliche snapshot RPMs für alle openSUSE Versionen (derzeit 11.1 bis 12.3) sowie SUSE Linux Enterprise 11 bereit.<br> + stellt binär und Quellcode .rpms und tägliche snapshot RPMs für alle openSUSE Versionen (derzeit 11.4 bis 13.1) sowie SUSE Linux Enterprise 11 bereit.<br> </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> diff --git a/templates/en/download.template b/templates/en/download.template index be9a8b1..804691f 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -93,7 +93,7 @@ requested in exchange for hosting the Wine web site.</p> <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <b><a href="http://en.opensuse.org/Wine#Repositories">Download SUSE packages</a></b> - - release binary and source .rpms and daily snapshot RPMs for all openSUSE versions (11.1 up to 12.3) and SUSE Linux Enterprise 11.<br> + - release binary and source .rpms and daily snapshot RPMs for all openSUSE versions (11.4 up to 13.1) and SUSE Linux Enterprise 11.<br> </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> diff --git a/templates/fr/download.template b/templates/fr/download.template index 2e2c4d9..893c88f 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -99,9 +99,7 @@ center;"><b>Voyez la </td> <td> <b><a href="http://en.opensuse.org/Wine#Repositories">Paquets SUSE</a></b> - .rpm binaires et sources et instantanés quotidiens pour openSUSE - 11.1, 11.2, 11.3, 11.4 ainsi que SUSE Linux Enterprise 10 et 11.<br> - Les anciens paquets sont disponibles sur -<a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a>. + 11.4 - 13.1 ainsi que SUSE Linux Enterprise 11.<br> </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> diff --git a/templates/he/download.template b/templates/he/download.template index 23df77e..1573b95 100644 --- a/templates/he/download.template +++ b/templates/he/download.template @@ -93,8 +93,7 @@ <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <b><a href="http://en.opensuse.org/Wine#Repositories">הורדת חבילות SUSE</a></b> - - release binary and source .rpms and daily snapshot RPMs for openSUSE 11.1, 11.2, 11.3, 11.4 and SUSE Linux Enterprise 10 and 11.<br> - Old package versions available on <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> + - release binary and source .rpms and daily snapshot RPMs for openSUSE 11.4 - 13.1 and SUSE Linux Enterprise 11.<br> </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> diff --git a/templates/pl/download.template b/templates/pl/download.template index 0cbfaf9..929f1c3 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -92,8 +92,7 @@ <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <b><a href="http://en.opensuse.org/Wine#Repositories">Pobierz paczki dla SUSE</a></b> - - binarne i źródłowe paczki .rpm oraz dzienne zrzuty dla openSUSE 11.1, 11.2, 11.3, 11.4 i SUSE Linux Enterprise 10 i 11.<br> - Stare wersje paczek dostępne na <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> + - binarne i źródłowe paczki .rpm oraz dzienne zrzuty dla openSUSE 11.4 - 13.1 i SUSE Linux Enterprise 11.<br> </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> diff --git a/templates/pt/download.template b/templates/pt/download.template index 24d8167..ba1b076 100644 --- a/templates/pt/download.template +++ b/templates/pt/download.template @@ -90,8 +90,7 @@ <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <b><a href="http://en.opensuse.org/Wine#Repositories">Descarregar pacotes para SUSE</a></b> - - .rpms binários e do código fonte e RPMs com snapshots diários para openSUSE 11.1, 11.2, 11.3, 11.4 e SUSE Linux Enterprise 10 e 11.<br> - Versões antigas dos pacotes disponíveis em <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> + - .rpms binários e do código fonte e RPMs com snapshots diários para openSUSE 11.4 - 13.1 e SUSE Linux Enterprise 11.<br> </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> diff --git a/templates/tr/download.template b/templates/tr/download.template index a67670f..77b7efe 100644 --- a/templates/tr/download.template +++ b/templates/tr/download.template @@ -89,8 +89,7 @@ <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE paketleri indirin</a></b> - - sürüm ikili ve kaynak .rpm dosyaları ve günlük RPM derlemeleri. openSUSE 11.1, 11.2, 11.3, 11.4 ve SUSE Linux Enterprise 10 ve 11 için.<br> - Eski paket sürümleri <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a>'dan indirilebilir. + - sürüm ikili ve kaynak .rpm dosyaları ve günlük RPM derlemeleri. openSUSE 11.4 - 13.1 ve SUSE Linux Enterprise 11 için.<br> </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> diff --git a/templates/uk/download.template b/templates/uk/download.template index 78063e3..ac727ff 100644 --- a/templates/uk/download.template +++ b/templates/uk/download.template @@ -92,7 +92,7 @@ <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <b><a href="http://en.opensuse.org/Wine#Repositories">Завантажити пакунки SUSE</a></b> - - бінарні та вихідні .rpm файли та щоденні RPM знімки для всіх версій openSUSE (від 11.1 до 12.3) та SUSE Linux Enterprise 11.<br> + - бінарні та вихідні .rpm файли та щоденні RPM знімки для всіх версій openSUSE (від 11.4 до 13.1) та SUSE Linux Enterprise 11.<br> </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template index c095ed5..41eaffb 100644 --- a/templates/zh-cn/download.template +++ b/templates/zh-cn/download.template @@ -91,7 +91,7 @@ requested in exchange for hosting the Wine web site.</p> <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <b><a href="http://en.opensuse.org/Wine#Repositories">下载 SUSE 安装包</a></b> - - 所有版本的 openSUSE （11.1 至 12.3）和 SUSE Linux Enterprise 11 的发行二进制和源码 .rpms 及每日快照 RPMs。<br> + - 所有版本的 openSUSE （11.4 至 13.1）和 SUSE Linux Enterprise 11 的发行二进制和源码 .rpms 及每日快照 RPMs。<br> </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr>

1 0

Andrey Gusev : Small translation for Ukrainian templates
by Jeremy Newman Jan. 6, 2014

Jan. 6, 2014

Module: website Branch: master Commit: cbbabdaa7b8f3d4c33729e13afcd25ceba62b935 URL: http://source.winehq.org/git/website.git/?a=commit;h=cbbabdaa7b8f3d4c33729e… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 6 13:57:43 2014 +0200 Small translation for Ukrainian templates --- templates/uk/global/themes/winehq/content.template | 4 ++-- .../uk/global/themes/winehq/content_nobox.template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/uk/global/themes/winehq/content.template b/templates/uk/global/themes/winehq/content.template index 36e843d..d9018aa 100644 --- a/templates/uk/global/themes/winehq/content.template +++ b/templates/uk/global/themes/winehq/content.template @@ -34,7 +34,7 @@ <input type="hidden" name="cx" value="partner-pub-0971840239976722:w9sqbcsxtyf"> <input type="hidden" name="cof" value="FORID:10"> <input type="hidden" name="ie" value="UTF-8"> - <span style="color: #ffffff;">Search:</span> <input type="text" name="q" size="20"> + <span style="color: #ffffff;">Пошук:</span> <input type="text" name="q" size="20"> </form> <script type="text/javascript" src="//www.google.com/coop/cse/brand?form=cse-search-box&lang={$langCode}"></script> </div> @@ -61,7 +61,7 @@ </div> <div id="footer"> - Hosted By + Хостинг надано <a href="http://www.codeweavers.com/"><img src="{$root}/images/cw_logo_sm.png" alt="CodeWeavers" title="CodeWeavers - Запуск Windows програм та ігор на Mac та Linux"></a> </div> diff --git a/templates/uk/global/themes/winehq/content_nobox.template b/templates/uk/global/themes/winehq/content_nobox.template index 4933c7f..32c4a8d 100644 --- a/templates/uk/global/themes/winehq/content_nobox.template +++ b/templates/uk/global/themes/winehq/content_nobox.template @@ -34,7 +34,7 @@ <input type="hidden" name="cx" value="partner-pub-0971840239976722:w9sqbcsxtyf"> <input type="hidden" name="cof" value="FORID:10"> <input type="hidden" name="ie" value="UTF-8"> - <span style="color: #ffffff;">Search:</span> <input type="text" name="q" size="20"> + <span style="color: #ffffff;">Пошук:</span> <input type="text" name="q" size="20"> </form> <script type="text/javascript" src="//www.google.com/coop/cse/brand?form=cse-search-box&lang={$langCode}"></script> </div> @@ -63,7 +63,7 @@ </div> <div id="footer"> - Hosted By + Хостинг надано <a href="http://www.codeweavers.com/"><img src="{$root}/images/cw_logo_sm.png" alt="CodeWeavers" title="CodeWeavers - Запуск Windows програм та ігор на Mac та Linux"></a> </div>

1 0

Andrey Gusev : Upgrade Slackware release version to 14.1
by Jeremy Newman Jan. 6, 2014

Jan. 6, 2014

Module: website Branch: master Commit: f1ffb3d31242e70ab4d3500eaddd5e0daed8a14a URL: http://source.winehq.org/git/website.git/?a=commit;h=f1ffb3d31242e70ab4d350… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 6 13:54:01 2014 +0200 Upgrade Slackware release version to 14.1 --- templates/uk/download.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/uk/download.template b/templates/uk/download.template index 1128f06..78063e3 100644 --- a/templates/uk/download.template +++ b/templates/uk/download.template @@ -102,7 +102,7 @@ <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <b><a href="http://sourceforge.net/projects/wine/files/Slackware Packages/">Завантажити пакунки Slackware</a></b> - - бінарні txz файли (Slackware 14.0), та tgz (для старіших версій)</td> + - бінарні txz файли (Slackware 14.1), та tgz (для старіших версій)</td> <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.10
by Jeremy Newman Jan. 6, 2014

Jan. 6, 2014

Module: website Branch: master Commit: a53b91e1c92ba93db10659d79f1145f5018daa04 URL: http://source.winehq.org/git/website.git/?a=commit;h=a53b91e1c92ba93db10659… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Jan 3 20:54:50 2014 +0100 Polish translation for release 1.7.10 --- news/pl/2014010301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2014010301.xml b/news/pl/2014010301.xml new file mode 100644 index 0000000..4109653 --- /dev/null +++ b/news/pl/2014010301.xml @@ -0,0 +1,17 @@ +<news> +<date>Styczeń 3, 2014</date> +<title>Wydano Wine 1.7.10</title> +<body> +<p> Wydanie rozwojowe Wine 1.7.10 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.7.10">Co nowego</a> w tym wydaniu: +<ul> + <li>Maksymalizacja okien w sterowniku Mac.</li> + <li>Implementacja kompresora AVI.</li> + <li>Pamięć lokalna wątku w dynamicznie wczytywanych bibliotekach.</li> + <li>Początki implementacji Harmonogramu Zadań.</li> + <li>Rozszerzone wsparcie protokołu IPX.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +<p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.10.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>. +</p></body></news>

1 0

André Hentschel : Wine 1.7.10 freigegeben
by Jeremy Newman Jan. 3, 2014

Jan. 3, 2014

Module: website Branch: master Commit: 0bcba942fb77216791459194126a83ced8b396b5 URL: http://source.winehq.org/git/website.git/?a=commit;h=0bcba942fb772167914591… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 3 21:28:42 2014 +0100 Wine 1.7.10 freigegeben --- news/de/2014010301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2014010301.xml b/news/de/2014010301.xml new file mode 100644 index 0000000..e44e9d8 --- /dev/null +++ b/news/de/2014010301.xml @@ -0,0 +1,17 @@ +<news> +<date>3. Januar 2014</date> +<title>Wine 1.7.10 freigegeben</title> +<body> +<p> Die Entwicklungsversion 1.7.10 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.7.10">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Fenster Maximierung im Mac Treiber.</li> + <li>AVI Compressor Implementierung.</li> + <li>Unterstützung für Thread-local storage in dynamisch geladenen Bibliotheken.</li> + <li>Anfänge einer Task Scheduler Implementierung.</li> + <li>Erweiterte Unterstützung für IPX Protokoll.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +<p>Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.10.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. +</p></body></news>

1 0

Andrey Gusev : Ukrainian translation for release 1.7.10
by Jeremy Newman Jan. 3, 2014

Jan. 3, 2014

Module: website Branch: master Commit: 3025938bf97a9fe2980fc9cf400a1d2f39fac4d7 URL: http://source.winehq.org/git/website.git/?a=commit;h=3025938bf97a9fe2980fc9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 3 22:08:11 2014 +0200 Ukrainian translation for release 1.7.10 --- news/uk/2014010301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/uk/2014010301.xml b/news/uk/2014010301.xml new file mode 100644 index 0000000..92c4165 --- /dev/null +++ b/news/uk/2014010301.xml @@ -0,0 +1,17 @@ +<news> +<date>3 січня 2014</date> +<title>Випущено Wine 1.7.10</title> +<body> +<p> Розробницький реліз Wine 1.7.10 наразі доступний.</p> +<p> <a href="{$root}/announce/1.7.10">Що нового</a> в цьому релізі: +<ul> + <li>Максимізація вікна в драйвері Mac.</li> + <li>Реалізація AVI компресора.</li> + <li>Підтримка локальної пам'яті нитей у динамічно завантажуваних бібліотеках.</li> + <li>Початок реалізації планувальника завдань.</li> + <li>Розширена підтримка протоколу IPX.</li> + <li>Виправлення різних помилок.</li> +</ul> +<p>Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.10.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</p></body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.10
by Jeremy Newman Jan. 3, 2014

Jan. 3, 2014

Module: website Branch: master Commit: 31d90b6f39adba7dede797e9de75b2edb7fd1b2a URL: http://source.winehq.org/git/website.git/?a=commit;h=31d90b6f39adba7dede797… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 3 20:57:30 2014 +0100 French translation for release 1.7.10 --- news/fr/2014010301.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/fr/2014010301.xml b/news/fr/2014010301.xml new file mode 100644 index 0000000..eaeb018 --- /dev/null +++ b/news/fr/2014010301.xml @@ -0,0 +1,16 @@ +<news> +<date>3 janvier 2014</date> +<title>Sortie de Wine 1.7.10</title> +<body> +<p> La version de développement 1.7.10 de Wine est disponible.</p> +<p> <a href="{$root}/announce/1.7.10">Nouveautés</a> de cette version : +<ul> + <li>Maximisation de fenêtres dans le pilote Mac.</li> + <li>Implémentation du compresseur AVI.</li> + <li>Prise en charge du stockage local aux threads dans les bibliothèques chargées dynamiquement.</li> + <li>Ébauche d'implémentation d'un planificateur de tâches.</li> + <li>Prise en charge étendue du protocole IPX.</li> + <li>Diverses corrections de bugs.</li> +</ul></p> +<p><p>Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.10.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</p></body></news>

1 0

Alexandre Julliard : Wine release 1.7.10
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: website Branch: master Commit: 1a15551755580bef8b2d790dc545ede7926de39a URL: http://source.winehq.org/git/website.git/?a=commit;h=1a15551755580bef8b2d79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 3 20:08:29 2014 +0100 Wine release 1.7.10 --- news/en/2014010301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2014010301.xml b/news/en/2014010301.xml new file mode 100644 index 0000000..c42c9cc --- /dev/null +++ b/news/en/2014010301.xml @@ -0,0 +1,17 @@ +<news> +<date>January 3, 2014</date> +<title>Wine 1.7.10 Released</title> +<body> +<p> The Wine development release 1.7.10 is now available.</p> +<p> <a href="{$root}/announce/1.7.10">What's new</a> in this release: +<ul> + <li>Window maximization in the Mac driver.</li> + <li>AVI compressor implementation.</li> + <li>Thread local storage support in dynamically loaded libraries.</li> + <li>Beginnings of a Task Scheduler implementation.</li> + <li>Extended IPX protocol support.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.10.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Alexandre Julliard : Release 1.7.10.
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: master Commit: 78f544fd4d7e5da3e7a291aba09ee27e440e38e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78f544fd4d7e5da3e7a291aba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 3 20:00:47 2014 +0100 Release 1.7.10. --- .mailmap | 1 + ANNOUNCE | 571 +++++++++++++++++++++++++++++++++---------------------------- VERSION | 2 +- configure | 18 +- 4 files changed, 322 insertions(+), 270 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78f544fd4d7e5da3e7a29…

1 0

Tag wine-1.7.10 : Alexandre Julliard : Release 1.7.10
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: refs/tags/wine-1.7.10 Tag: f7c303054dc10e2ea318f331308a0f5d7943d3df URL: http://source.winehq.org/git/wine.git/?a=tag;h=f7c303054dc10e2ea318f331308a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 3 20:00:47 2014 +0100 Release 1.7.10

1 0

Frédéric Delanoy : comctl32/tests: Use BOOL type where appropriate.
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: master Commit: 29b2db009cba7b639ba35238bd3f67e52d76a0ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b2db009cba7b639ba35238b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 3 02:03:28 2014 +0100 comctl32/tests: Use BOOL type where appropriate. --- dlls/comctl32/tests/header.c | 2 +- dlls/comctl32/tests/monthcal.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 85437d0..7fb73b1 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1690,7 +1690,7 @@ static BOOL init(void) /* maximum 8 items allowed */ static void check_orderarray(HWND hwnd, DWORD start, DWORD set, DWORD expected, - int todo, int line) + BOOL todo, int line) { int count, i; INT order[8]; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 604fb99..145d20f 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -961,18 +961,18 @@ static void test_hittest(void) typedef struct hittest_test { UINT ht; - int todo; + BOOL todo; } hittest_test_t; static const hittest_test_t title_hits[] = { /* Start is the same everywhere */ - { MCHT_TITLE, 0 }, - { MCHT_TITLEBTNPREV, 0 }, + { MCHT_TITLE, FALSE }, + { MCHT_TITLEBTNPREV, FALSE }, /* The middle piece is only tested for presence of items */ /* End is the same everywhere */ - { MCHT_TITLEBTNNEXT, 0 }, - { MCHT_TITLE, 0 }, - { MCHT_NOWHERE, 1 } + { MCHT_TITLEBTNNEXT, FALSE }, + { MCHT_TITLE, FALSE }, + { MCHT_NOWHERE, TRUE } }; MCHITTESTINFO mchit;

1 0

Hans Leidekker : msi: Fall back to the global temporary directory when the TempFolder property resolves to a non-existing directory .
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: master Commit: fcb924c1441f573fc6eabb2afcb44716de373e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb924c1441f573fc6eabb2af… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 3 15:01:00 2014 +0100 msi: Fall back to the global temporary directory when the TempFolder property resolves to a non-existing directory. --- dlls/msi/custom.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index eadb355..63bec19 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -215,8 +215,8 @@ static MSIBINARY *create_temp_binary( MSIPACKAGE *package, LPCWSTR source, BOOL DWORD sz = MAX_PATH, write; UINT r; - if (msi_get_property(package->db, szTempFolder, fmt, &sz) != ERROR_SUCCESS) - GetTempPathW(MAX_PATH, fmt); + if (msi_get_property(package->db, szTempFolder, fmt, &sz) != ERROR_SUCCESS || + GetFileAttributesW(fmt) == INVALID_FILE_ATTRIBUTES) GetTempPathW(MAX_PATH, fmt); if (!GetTempFileNameW( fmt, szMsi, 0, tmpfile )) {

1 0

Hans Leidekker : msi: Always derive the SourceDir property from the database path.
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: master Commit: 41d2b53c5b6d9815f73610aad1ff6bb5e2c5cbbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d2b53c5b6d9815f73610aad… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 3 15:00:33 2014 +0100 msi: Always derive the SourceDir property from the database path. --- dlls/msi/action.c | 42 +++++++++++------------------------------- 1 files changed, 11 insertions(+), 31 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2a0bf87..aab8c0f 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -424,41 +424,21 @@ static BOOL ui_sequence_exists( MSIPACKAGE *package ) UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) { - LPWSTR source, check; + WCHAR *source, *check, *p, *db; + DWORD len; - if (msi_get_property_int( package->db, szInstalled, 0 )) - { - HKEY hkey; + if (!(db = msi_dup_property( package->db, szOriginalDatabase ))) + return ERROR_OUTOFMEMORY; - MSIREG_OpenInstallProps( package->ProductCode, package->Context, NULL, &hkey, FALSE ); - source = msi_reg_get_val_str( hkey, INSTALLPROPERTY_INSTALLSOURCEW ); - RegCloseKey( hkey ); - } - else + if (!(p = strrchrW( db, '\\' )) && !(p = strrchrW( db, '/' ))) { - LPWSTR p, db; - DWORD len; - - db = msi_dup_property( package->db, szOriginalDatabase ); - if (!db) - return ERROR_OUTOFMEMORY; - - p = strrchrW( db, '\\' ); - if (!p) - { - p = strrchrW( db, '/' ); - if (!p) - { - msi_free(db); - return ERROR_SUCCESS; - } - } - - len = p - db + 2; - source = msi_alloc( len * sizeof(WCHAR) ); - lstrcpynW( source, db, len ); - msi_free( db ); + msi_free(db); + return ERROR_SUCCESS; } + len = p - db + 2; + source = msi_alloc( len * sizeof(WCHAR) ); + lstrcpynW( source, db, len ); + msi_free( db ); check = msi_dup_property( package->db, szSourceDir ); if (!check || replace)

1 0

Frédéric Delanoy : ddraw/tests: Use BOOL type where appropriate.
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: master Commit: 6151371de37f46e6ed13ead13682f555b1825a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6151371de37f46e6ed13ead13… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 3 02:03:29 2014 +0100 ddraw/tests: Use BOOL type where appropriate. --- dlls/ddraw/tests/d3d.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index effe743..25da038 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3193,11 +3193,11 @@ static void FindDevice(void) static const struct { const GUID *guid; - int todo; + BOOL todo; } deviceGUIDs[] = { - {&IID_IDirect3DRampDevice, 1}, - {&IID_IDirect3DRGBDevice}, + {&IID_IDirect3DRampDevice, TRUE}, + {&IID_IDirect3DRGBDevice, FALSE}, }; static const GUID *nonexistent_deviceGUIDs[] = {&IID_IDirect3DMMXDevice,

1 0

Hans Leidekker : mscms: Print a fixme when compiled without support for liblcms2.
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: master Commit: 190878d92df7eaaf3720df7edebaae4b6ac807b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=190878d92df7eaaf3720df7ed… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 3 15:01:57 2014 +0100 mscms: Print a fixme when compiled without support for liblcms2. --- dlls/mscms/mscms_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mscms/mscms_main.c b/dlls/mscms/mscms_main.c index 3f8dae5..4653cc7 100644 --- a/dlls/mscms/mscms_main.c +++ b/dlls/mscms/mscms_main.c @@ -53,6 +53,8 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) DisableThreadLibraryCalls( hinst ); #ifdef HAVE_LCMS2 cmsSetLogErrorHandler( lcms_error_handler ); +#else + FIXME( "Wine was built without support for liblcms2, expect problems\n" ); #endif break; case DLL_PROCESS_DETACH:

1 0

Hans Leidekker : msi: Remove the unused CurrentlyScripting field from MSISCRIPT.
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: master Commit: 48908c130c97128a78c37d2bf87ae2b2d1daa8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48908c130c97128a78c37d2bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 3 15:01:23 2014 +0100 msi: Remove the unused CurrentlyScripting field from MSISCRIPT. --- dlls/msi/action.c | 7 ------- dlls/msi/msipriv.h | 1 - 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index aab8c0f..73aae35 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3178,8 +3178,6 @@ static UINT ACTION_RemoveRegistryValues( MSIPACKAGE *package ) static UINT ACTION_InstallInitialize(MSIPACKAGE *package) { - package->script->CurrentlyScripting = TRUE; - return ERROR_SUCCESS; } @@ -5291,9 +5289,6 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package) UINT rc; WCHAR *remove; - /* turn off scheduling */ - package->script->CurrentlyScripting= FALSE; - /* first do the same as an InstallExecute */ rc = ACTION_InstallExecute(package); if (rc != ERROR_SUCCESS) @@ -7820,8 +7815,6 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, else rc = ACTION_ProcessExecSequence(package, FALSE); - package->script->CurrentlyScripting = FALSE; - /* process the ending type action */ if (rc == ERROR_SUCCESS) ACTION_PerformActionSequence(package, -1); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index c597fe6..3780d48 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -686,7 +686,6 @@ typedef struct tagMSISCRIPT LPWSTR *Actions[SCRIPT_MAX]; UINT ActionCount[SCRIPT_MAX]; BOOL ExecuteSequenceRun; - BOOL CurrentlyScripting; UINT InWhatSequence; LPWSTR *UniqueActions; UINT UniqueActionsCount;

1 0

Piotr Caban : msvcp80: Fix ostreambuf_iterator<char> structure definition.
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: master Commit: 2a8a1452acdeb0eb671ac4526ea10485307ffc31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8a1452acdeb0eb671ac4526… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 3 14:08:19 2014 +0100 msvcp80: Fix ostreambuf_iterator<char> structure definition. --- dlls/msvcp90/ios.c | 88 ++++++++++++++++++------ dlls/msvcp90/locale.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 6 ++ 3 files changed, 244 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a8a1452acdeb0eb671ac…

1 0

Alexandre Julliard : version: Load the resource that corresponds to the current language first.
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: master Commit: 2a7cdcf3c56c1708f6e1b6de1ac47cf6cc3c7963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a7cdcf3c56c1708f6e1b6de1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 3 17:25:18 2014 +0100 version: Load the resource that corresponds to the current language first. --- dlls/version/version.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index c2e9c9d..a2f1801 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -109,6 +109,46 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_default( const IMAGE_RESOURCE_ } +/********************************************************************** + * push_language + * + * push a language in the list of languages to try + */ +static inline int push_language( WORD *list, int pos, WORD lang ) +{ + int i; + for (i = 0; i < pos; i++) if (list[i] == lang) return pos; + list[pos++] = lang; + return pos; +} + + +/********************************************************************** + * find_entry_language + */ +static const IMAGE_RESOURCE_DIRECTORY *find_entry_language( const IMAGE_RESOURCE_DIRECTORY *dir, + const void *root ) +{ + const IMAGE_RESOURCE_DIRECTORY *ret; + WORD list[9]; + int i, pos = 0; + + /* cf. LdrFindResource_U */ + pos = push_language( list, pos, MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL ) ); + pos = push_language( list, pos, LANGIDFROMLCID( NtCurrentTeb()->CurrentLocale ) ); + pos = push_language( list, pos, GetUserDefaultLangID() ); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetUserDefaultLangID()), SUBLANG_NEUTRAL )); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetUserDefaultLangID()), SUBLANG_DEFAULT )); + pos = push_language( list, pos, GetSystemDefaultLangID() ); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_NEUTRAL )); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_DEFAULT )); + pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); + + for (i = 0; i < pos; i++) if ((ret = find_entry_by_id( dir, list[i], root ))) return ret; + return find_entry_default( dir, root ); +} + + /*********************************************************************** * read_xx_header [internal] */ @@ -316,7 +356,7 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) TRACE("No resid entry found\n" ); goto done; } - resPtr = find_entry_default( resPtr, resDir ); + resPtr = find_entry_language( resPtr, resDir ); if ( !resPtr ) { TRACE("No default language entry found\n" );

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Jan. 3, 2014

Jan. 3, 2014

Module: wine Branch: master Commit: 1f26451964e0c9fe8944f06a7186b1b5d24e61c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f26451964e0c9fe8944f06a7… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 3 10:22:51 2014 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw4.c | 24 ++++++++++++------------ dlls/ddraw/tests/ddraw7.c | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index f215f12..df1a23c 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5496,12 +5496,12 @@ static void test_user_memory_getdc(void) ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; ddsd.dwWidth = 16; ddsd.dwHeight = 16; - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); - ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; - U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; - U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; - U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000ff; ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -5555,12 +5555,12 @@ static void test_sysmem_overlay(void) ddsd.dwWidth = 16; ddsd.dwHeight = 16; ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OVERLAY; - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); - ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; - U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; - U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; - U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000ff; hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(hr == DDERR_NOOVERLAYHW, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 18e1823..e36927e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5390,12 +5390,12 @@ static void test_user_memory_getdc(void) ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; ddsd.dwWidth = 16; ddsd.dwHeight = 16; - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); - ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; - U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; - U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; - U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000ff; ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -5449,12 +5449,12 @@ static void test_sysmem_overlay(void) ddsd.dwWidth = 16; ddsd.dwHeight = 16; ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OVERLAY; - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); - ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; - U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; - U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; - U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000ff; hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(hr == DDERR_NOOVERLAYHW, "Got unexpected hr %#x.\n", hr);

1 0