March 2013 - Wine-Commits - list.winehq.org

Piotr Caban : cryptnet: Don' t ignore HttpEndRequestW error in HTTP_RetrieveEncodedObjectW.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: b8e2edf19c27c91641a6c26d07b94ecf33839467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e2edf19c27c91641a6c26d0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 8 11:17:53 2013 +0100 cryptnet: Don't ignore HttpEndRequestW error in HTTP_RetrieveEncodedObjectW. --- dlls/cryptnet/cryptnet_main.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 64af80c..ddfdbce 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -941,19 +941,15 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, else ret = TRUE; } - /* We don't set ret to TRUE in this block to avoid masking - * an error from HttpSendRequestExW. - */ if (ret && - !HttpEndRequestW(hHttp, NULL, 0, (DWORD_PTR)context) && + !(ret = HttpEndRequestW(hHttp, NULL, 0, (DWORD_PTR)context)) && GetLastError() == ERROR_IO_PENDING) { if (WaitForSingleObject(context->event, context->timeout) == WAIT_TIMEOUT) - { SetLastError(ERROR_TIMEOUT); - ret = FALSE; - } + else + ret = TRUE; } if (ret) ret = CRYPT_DownloadObject(dwRetrievalFlags, hHttp,

1 0

Jacek Caban : wininet: Don' t pass expected cache file size to CreateUrlCacheEntry if it's unknown.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: d1ce8ba0534e1e42e3b7129c1dc8b75e1354bfed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ce8ba0534e1e42e3b7129c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 15:59:20 2013 +0100 wininet: Don't pass expected cache file size to CreateUrlCacheEntry if it's unknown. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 890adce..498e848 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2276,7 +2276,7 @@ static void create_cache_entry(http_request_t *req) return; } - b = CreateUrlCacheEntryW(url, req->contentLength, NULL, file_name, 0); + b = CreateUrlCacheEntryW(url, req->contentLength == ~0u ? 0 : req->contentLength, NULL, file_name, 0); if(!b) { WARN("Could not create cache entry: %08x\n", GetLastError()); return;

1 0

Dmitry Timoshkov : windowscodecs: Fix handling of a tRNS PNG chunk in the frame CopyPalette method.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 18e76792a76291c7a8211b6daa433ba6532c840f URL: http://source.winehq.org/git/wine.git/?a=commit;h=18e76792a76291c7a8211b6da… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 8 13:18:06 2013 +0900 windowscodecs: Fix handling of a tRNS PNG chunk in the frame CopyPalette method. --- dlls/windowscodecs/pngformat.c | 17 ++++++----------- dlls/windowscodecs/tests/pngformat.c | 2 -- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 2f6a9e3..1708580 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -798,7 +798,7 @@ static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, png_colorp png_palette; int num_palette; WICColor palette[256]; - png_bytep trans; + png_bytep trans_alpha; int num_trans; png_color_16p trans_values; int i; @@ -822,23 +822,18 @@ static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, goto end; } + ret = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans_alpha, &num_trans, &trans_values); + if (!ret) num_trans = 0; + for (i=0; i<num_palette; i++) { - palette[i] = (0xff000000| + BYTE alpha = (i < num_trans) ? trans_alpha[i] : 0xff; + palette[i] = (alpha << 24 | png_palette[i].red << 16| png_palette[i].green << 8| png_palette[i].blue); } - ret = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans, &num_trans, &trans_values); - if (ret) - { - for (i=0; i<num_trans; i++) - { - palette[trans[i]] = 0x00000000; - } - } - end: LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 61c56b3..a222ebc 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -577,9 +577,7 @@ static void test_png_palette(void) hr = IWICPalette_GetColors(palette, 256, color, &ret); ok(hr == S_OK, "GetColors error %#x\n", hr); ok(ret == count, "expected %u, got %u\n", count, ret); -todo_wine ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); -todo_wine ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); IWICPalette_Release(palette);

1 0

Ken Thomases : winemac: Improve handling of "invert" pixels in monochrome cursors.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 37b33a9de83d0942616f08c9eb66203296ae6ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b33a9de83d0942616f08c9e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Mar 7 20:37:02 2013 -0600 winemac: Improve handling of "invert" pixels in monochrome cursors. --- dlls/winemac.drv/mouse.c | 109 +++++++++++++++++++++++++++++++++------------- 1 files changed, 79 insertions(+), 30 deletions(-) diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index cfbb274..66214fe 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -258,21 +258,6 @@ done: } /*********************************************************************** - * release_provider_cfdata - * - * Helper for create_monochrome_cursor. A CFData is used by two - * different CGDataProviders, using different offsets. One of them is - * constructed with a pointer to the bytes, not a reference to the - * CFData object (because of the offset). So, the CFData is CFRetain'ed - * on its behalf at creation and released here. - */ -void release_provider_cfdata(void *info, const void *data, size_t size) -{ - CFRelease(info); -} - - -/*********************************************************************** * create_monochrome_cursor */ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, int height) @@ -280,6 +265,9 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, char buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; BITMAPINFO *info = (BITMAPINFO *)buffer; unsigned int width_bytes = (width + 31) / 32 * 4; + unsigned long *and_bits = NULL, *xor_bits; + unsigned long *data_bits; + int count, i; CGColorSpaceRef colorspace; CFMutableDataRef data; CGDataProviderRef provider; @@ -306,43 +294,86 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; - /* This will be owned by the data provider for the mask image and released - when it is destroyed. */ - data = CFDataCreateMutable(NULL, info->bmiHeader.biSizeImage); - if (!data) + and_bits = HeapAlloc(GetProcessHeap(), 0, info->bmiHeader.biSizeImage); + if (!and_bits) { - WARN("failed to create data\n"); + WARN("failed to allocate and_bits\n"); return NULL; } - CFDataSetLength(data, info->bmiHeader.biSizeImage); + xor_bits = (unsigned long*)((char*)and_bits + info->bmiHeader.biSizeImage / 2); - if (!GetDIBits(hdc, icon->hbmMask, 0, height * 2, CFDataGetMutableBytePtr(data), info, DIB_RGB_COLORS)) + if (!GetDIBits(hdc, icon->hbmMask, 0, height * 2, and_bits, info, DIB_RGB_COLORS)) { WARN("GetDIBits failed\n"); - CFRelease(data); + HeapFree(GetProcessHeap(), 0, and_bits); return NULL; } + /* On Windows, the pixels of a monochrome cursor can have four effects: + draw black, draw white, leave unchanged (transparent), or invert. The Mac + only supports the first three. It can't do pixels which invert the + background. Since the background is usually white, I am arbitrarily + mapping "invert" to "draw black". This entails bitwise math between the + cursor's AND mask and XOR mask: + + AND | XOR | Windows cursor pixel + -------------------------------- + 0 | 0 | black + 0 | 1 | white + 1 | 0 | transparent + 1 | 1 | invert + + AND | XOR | Mac image + --------------------- + 0 | 0 | black (0) + 0 | 1 | white (1) + 1 | 0 | don't care + 1 | 1 | black (0) + + AND | XOR | Mac mask + --------------------------- + 0 | 0 | paint (0) + 0 | 1 | paint (0) + 1 | 0 | don't paint (1) + 1 | 1 | paint (0) + + So, Mac image = AND ^ XOR and Mac mask = AND & ~XOR. + */ + /* Create data for Mac image. */ + data = CFDataCreateMutable(NULL, info->bmiHeader.biSizeImage / 2); + if (!data) + { + WARN("failed to create data\n"); + HeapFree(GetProcessHeap(), 0, and_bits); + return NULL; + } + + /* image data = AND mask */ + CFDataAppendBytes(data, (UInt8*)and_bits, info->bmiHeader.biSizeImage / 2); + /* image data ^= XOR mask */ + data_bits = (unsigned long*)CFDataGetMutableBytePtr(data); + count = (info->bmiHeader.biSizeImage / 2) / sizeof(*data_bits); + for (i = 0; i < count; i++) + data_bits[i] ^= xor_bits[i]; + colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericGray); if (!colorspace) { WARN("failed to create colorspace\n"); CFRelease(data); + HeapFree(GetProcessHeap(), 0, and_bits); return NULL; } - /* The data object needs to live as long as this provider, so retain it an - extra time and have the provider's data-release callback release it. */ - provider = CGDataProviderCreateWithData(data, CFDataGetBytePtr(data) + width_bytes * height, - width_bytes * height, release_provider_cfdata); + provider = CGDataProviderCreateWithCFData(data); + CFRelease(data); if (!provider) { WARN("failed to create data provider\n"); CGColorSpaceRelease(colorspace); - CFRelease(data); + HeapFree(GetProcessHeap(), 0, and_bits); return NULL; } - CFRetain(data); cgimage = CGImageCreate(width, height, 1, 1, width_bytes, colorspace, kCGImageAlphaNone | kCGBitmapByteOrderDefault, @@ -352,10 +383,28 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, if (!cgimage) { WARN("failed to create image\n"); - CFRelease(data); + HeapFree(GetProcessHeap(), 0, and_bits); + return NULL; + } + + /* Create data for mask. */ + data = CFDataCreateMutable(NULL, info->bmiHeader.biSizeImage / 2); + if (!data) + { + WARN("failed to create data\n"); + CGImageRelease(cgimage); + HeapFree(GetProcessHeap(), 0, and_bits); return NULL; } + /* mask data = AND mask */ + CFDataAppendBytes(data, (UInt8*)and_bits, info->bmiHeader.biSizeImage / 2); + /* mask data &= ~XOR mask */ + data_bits = (unsigned long*)CFDataGetMutableBytePtr(data); + for (i = 0; i < count; i++) + data_bits[i] &= ~xor_bits[i]; + HeapFree(GetProcessHeap(), 0, and_bits); + provider = CGDataProviderCreateWithCFData(data); CFRelease(data); if (!provider)

1 0

C.W. Betts : winemac: Fix compilation on Lion and later.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: c333c6ea6c3338b2d4650342ab75219147b062cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c333c6ea6c3338b2d4650342a… Author: C.W. Betts <computers57(a)hotmail.com> Date: Thu Mar 7 15:12:45 2013 -0700 winemac: Fix compilation on Lion and later. --- dlls/winemac.drv/opengl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 0f62e28..e3e9aa4 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -33,6 +33,7 @@ #include "wine/wglext.h" #define __gl_h_ +#define __gltypes_h_ #include <OpenGL/OpenGL.h> #include <OpenGL/glu.h> #include <OpenGL/CGLRenderers.h>

1 0

Daniel Jelinski : comctl32/listview: Correct sending NM_CUSTOMDRAW to subitem 0.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: fae9738cc37c4d30710f12ee99abc11c7ae37130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae9738cc37c4d30710f12ee9… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Thu Mar 7 20:35:19 2013 +0100 comctl32/listview: Correct sending NM_CUSTOMDRAW to subitem 0. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4ae974e..b084e5e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4621,7 +4621,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS if (nSubItem == 0) infoPtr->cditemmode = cdsubitemmode; if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint; /* we have to send a CDDS_SUBITEM customdraw explicitly for subitem 0 */ - if (nSubItem == 0 && cdsubitemmode == CDRF_NOTIFYITEMDRAW) + if (nSubItem == 0 && (cdsubitemmode & CDRF_NOTIFYITEMDRAW) != 0) { cdsubitemmode = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPREPAINT, &nmlvcd); if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint;

1 0

Andrew Talbot : ws2_32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 05d5654237c1af93661a3f5e21c792f6e431883d URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d5654237c1af93661a3f5e2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 7 22:22:31 2013 +0000 ws2_32: Avoid signed-unsigned integer comparisons. --- dlls/ws2_32/socket.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 05c7aac..f9e8a6c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2881,7 +2881,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, { struct irda_device_list *src = (struct irda_device_list *)buf; DEVICELIST *dst = (DEVICELIST *)optval; - INT needed = sizeof(DEVICELIST), i; + INT needed = sizeof(DEVICELIST); + unsigned int i; if (src->len > 0) needed += (src->len - 1) * sizeof(IRDA_DEVICE_INFO); @@ -4605,6 +4606,7 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type) static struct WS_hostent* WS_get_local_ips( char *hostname ) { int last_metric, numroutes = 0, i, j; + DWORD n; PIP_ADAPTER_INFO adapters = NULL, k; struct WS_hostent *hostlist = NULL; PMIB_IPFORWARDTABLE routes = NULL; @@ -4627,15 +4629,15 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) if (GetIpForwardTable(routes, &route_size, FALSE) != NO_ERROR) goto cleanup; /* Store the interface associated with each route */ - for (i = 0; i < routes->dwNumEntries; i++) + for (n = 0; n < routes->dwNumEntries; n++) { IF_INDEX ifindex; DWORD ifmetric, exists = FALSE; - if (routes->table[i].u1.ForwardType != MIB_IPROUTE_TYPE_DIRECT) + if (routes->table[n].u1.ForwardType != MIB_IPROUTE_TYPE_DIRECT) continue; - ifindex = routes->table[i].dwForwardIfIndex; - ifmetric = routes->table[i].dwForwardMetric1; + ifindex = routes->table[n].dwForwardIfIndex; + ifmetric = routes->table[n].dwForwardMetric1; /* Only store the lowest valued metric for an interface */ for (j = 0; j < numroutes; j++) {

1 0

Andrew Talbot : xmllite: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 2cc28bc7ae96b0ddc685e9bd53a71c5b68268543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc28bc7ae96b0ddc685e9bd5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 7 22:22:42 2013 +0000 xmllite: Avoid signed-unsigned integer comparisons. --- dlls/xmllite/reader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 7bec2b1..c6f416d 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1190,7 +1190,7 @@ static HRESULT reader_parse_pitarget(xmlreader *reader, strval *target) static const WCHAR xmlW[] = {'x','m','l'}; strval name; HRESULT hr; - int i; + UINT i; hr = reader_parse_name(reader, &name); if (FAILED(hr)) return WC_E_PI;

1 0

Andrew Talbot : wsock32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 19502c65c991ad50019293ebcd1f83b824dfd7ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=19502c65c991ad50019293ebc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 7 22:22:36 2013 +0000 wsock32: Avoid signed-unsigned integer comparisons. --- dlls/wsock32/protocol.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c index 9482887..f398d6a 100644 --- a/dlls/wsock32/protocol.c +++ b/dlls/wsock32/protocol.c @@ -115,7 +115,8 @@ INT WINAPI EnumProtocolsA(LPINT protocols, LPVOID buffer, LPDWORD buflen) { WSAPROTOCOL_INFOA *wsabuf; PROTOCOL_INFOA *pi = buffer; - unsigned int i, string_offset; + unsigned int string_offset; + INT i; if (!(wsabuf = HeapAlloc(GetProcessHeap(), 0, size))) return SOCKET_ERROR; @@ -169,7 +170,8 @@ INT WINAPI EnumProtocolsW(LPINT protocols, LPVOID buffer, LPDWORD buflen) { WSAPROTOCOL_INFOW *wsabuf; PROTOCOL_INFOW *pi = buffer; - unsigned int i, string_offset; + unsigned int string_offset; + INT i; if (!(wsabuf = HeapAlloc(GetProcessHeap(), 0, size))) return SOCKET_ERROR;

1 0

Francois Gouget : testbot: Some documentation tweaks and fixes for the crontab examples and a git clone command .
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: tools Branch: master Commit: 09c1b483b7c062442fcfd4fb38efd59f5bf4c2ab URL: http://source.winehq.org/git/tools.git/?a=commit;h=09c1b483b7c062442fcfd4fb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 8 15:13:59 2013 +0100 testbot: Some documentation tweaks and fixes for the crontab examples and a git clone command. --- testbot/doc/INSTALL.txt | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index c8597d2..4e4e33c 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -66,10 +66,10 @@ General setup for the web site: Janitorial tasks: - Run the Janitor.pl script once per day to perform the janitorial tasks. For instance: - 17 30 * * * /home/winehq/tools/testbot/bin/Janitor.pl + 0 0 * * * $HOME/tools/testbot/bin/Janitor.pl - Run the CheckWineTestBot.pl script periodically to get notified in case the WineTestBot server dies. For instance: - * 5 * * * /home/winehq/tools/testbot/scripts/CheckWineTestBot.pl + */20 * * * * $HOME/tools/testbot/scripts/CheckWineTestBot.pl Setup for Wine's patches site: - See http://source.winehq.org/patches/ for reference. @@ -96,8 +96,8 @@ Setup for Wine's patches site: Setup for Winetest updates: - Use a cron job to run CheckForWinetestUpdate.pl periodically. For instance: - * 0 * * * /home/winehq/tools/testbot/bin/CheckForWinetestUpdate.pl 32 - * 0 * * * /home/winehq/tools/testbot/bin/CheckForWinetestUpdate.pl 64 + */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl 32 + */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl 64 Setup for wine-patches: - A proper WineTestBot system should integrate with Wine's patches site. @@ -142,7 +142,7 @@ Dependencies: repository to wine: mkdir $HOME/tools/testbot/var cd $HOME/tools/testbot/var - git clone git://source.winehq.org/git/wine.git wine + git clone git://source.winehq.org/git/wine.git - Run $HOME/tools/testbot/bin/build/Reconfig.pl. - Check $HOME/tools/testbot/var/Reconfig.log to make sure it succeeded. Fix issues until it works.

1 0

Francois Gouget : patches: Improve the documentation, particularly for the installation process.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: tools Branch: master Commit: 7e9eb2d3d0b023740abeaa28a15c0f04bc8378f9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7e9eb2d3d0b023740abeaa28… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 8 15:14:52 2013 +0100 patches: Improve the documentation, particularly for the installation process. --- patches/doc/INSTALL.txt | 77 +++++++++++++++++++++++++++++++++++++++++ patches/doc/vhost_source.conf | 11 ++++++ patches/expire | 3 +- patches/filter | 4 ++- patches/filter-testbot | 3 +- patches/notify-bot | 2 +- patches/update | 3 +- patches/update-regressions | 3 ++ 8 files changed, 101 insertions(+), 5 deletions(-) diff --git a/patches/doc/INSTALL.txt b/patches/doc/INSTALL.txt new file mode 100644 index 0000000..86b3dca --- /dev/null +++ b/patches/doc/INSTALL.txt @@ -0,0 +1,77 @@ +1. Dependencies +--------------- + +- Text::CSV::Encoded (libtext-csv-encoded-perl) +- Email::MIME (libemail-mime-perl) + + +2. General setup +---------------- + +- Create a new user 'winehq'. +- Clone Wine's tools repository to $HOME/tools (so this document + should be available as $HOME/tools/patches/README). +- Create directory $HOME/opt/source/git. Run: + mkdir -p $HOME/opt/source/git +- Clone the Wine repository to a new bare repository (it can be read-only). + cd $HOME/opt/source/git + git clone --bare git://source.winehq.org/git/wine.git +- Arrange for the Wine source to be updated regularly. For instance: + 0 * * * * cd $HOME/opt/source/git/wine.git && git fetch + +Apache setup: +- Create the $HOME/opt/source directory. This is the root of the source website: + mkdir -p $HOME/opt/source +- Create a new virtual host, use vhost_source.conf as a template. + + +3. Setup for the LXR source site +-------------------------------- + +- FIXME: Document how to set up LXR in $HOME/opt/source. + + +4. Setup for the patches site +----------------------------- + +- Create the $HOME/opt/source/patches directory and copy patches.css there: + mkdir $HOME/opt/source/patches + cp patches.css $HOME/opt/source/patches +- Create the $HOME/patches and $HOME/patches/OLD directories where the patch + data will live: + mkdir -p $HOME/patches/OLD +- Arrange for the filter script to be fed the wine-patches emails. One way to + do so would be to subscribe the winehq user to the wine-patches mailing list + and to then add the following lines to the .procmailrc file: + :0 + * ^List-Id: Wine Patch Submissions + { + :0 hbfw + | $HOME/tools/patches/filter + :0: + $HOME/patches/. + } +- If you have a set of patch emails in the mbox format you can test with: + formail -ds procmail <mbox-file +- Run update regularly to update the website: + */5 * * * * $HOME/tools/patches/update +- Run expire regularly to delete old patches: + 0 0 * * * $HOME/tools/patches/expire -v $HOME/patches + +To integrate with the WineTestBot also do the following: +- Run the notify-bot script regularly to notify the WineTestBot when there are + new patches to test. + */5 * * * * $HOME/tools/patches/notify-bot <winetestbot-email-address> +- Arrange for the filter-testbot script to be fed the WineTestBot emails. One + way to do so is to add the following lines to the .procmailrc file: + :0 bfw + * ^X-TestBot-Results: + | $HOME/tools/patches/filter-testbot + + + +5. Setup for the regressions site +--------------------------------- + +- Run update-regressions regularly. For instance: + 0 * * * * $HOME/tools/patches/update-regressions diff --git a/patches/doc/vhost_source.conf b/patches/doc/vhost_source.conf new file mode 100644 index 0000000..30bfca5 --- /dev/null +++ b/patches/doc/vhost_source.conf @@ -0,0 +1,11 @@ +<VirtualHost *:80> + DocumentRoot /home/winehq/opt/source + + ServerName source.example.com + ServerAdmin winehq(a)example.com + + <Directory /home/winehq/opt/source> + Order allow,deny + Allow from all + </Directory> +</VirtualHost> diff --git a/patches/expire b/patches/expire index 05aee19..f143ab1 100755 --- a/patches/expire +++ b/patches/expire @@ -1,6 +1,7 @@ #!/usr/bin/perl -w # -# Patches expiration script +# Deletes or archives 'old' patches. Note that the exact definition of 'old' +# depends on the patch's status. # # Copyright 2009 Alexandre Julliard # diff --git a/patches/filter b/patches/filter index dbdb9ec..306787d 100755 --- a/patches/filter +++ b/patches/filter @@ -1,6 +1,8 @@ #!/usr/bin/perl -w # -# Filter a wine-patches submission. +# Reformat a wine-patches email so it can be put in a file that the patches +# site can link to. In particular this means only keeping the relevant +# header fields and decoding / decompressing the patch. # # Copyright 2009 Alexandre Julliard # diff --git a/patches/filter-testbot b/patches/filter-testbot index 3c4e33b..844090c 100755 --- a/patches/filter-testbot +++ b/patches/filter-testbot @@ -1,6 +1,7 @@ #!/usr/bin/perl -w # -# Filter a testbot result report. +# Process a testbot result email and generate the .testfail and .testbot +# result files that the patches site uses / links to. # # Copyright 2010 Alexandre Julliard # diff --git a/patches/notify-bot b/patches/notify-bot index 104a496..9676c42 100755 --- a/patches/notify-bot +++ b/patches/notify-bot @@ -1,6 +1,6 @@ #!/bin/sh # -# Notify winetestbot of the arrival of new patches +# Send an email to the WineTestBot to let it know of new patches. # # Copyright 2010 Alexandre Julliard # diff --git a/patches/update b/patches/update index f92a64c..c716354 100755 --- a/patches/update +++ b/patches/update @@ -1,6 +1,7 @@ #!/usr/bin/perl -w # -# Update the patches data and index file +# Scans the local patches and their result files to rebuild the index file and +# update the patches website. # # Copyright 2009 Alexandre Julliard # diff --git a/patches/update-regressions b/patches/update-regressions index 3a71509..3bc2fff 100755 --- a/patches/update-regressions +++ b/patches/update-regressions @@ -1,5 +1,8 @@ #!/usr/bin/perl -w # +# Grabs Bugzilla's data about known regressions and rebuilds the regressions +# website index. +# # Copyright 2011 Henri Verbeet # Copyright 2011 Alexandre Julliard #

1 0

Francois Gouget : patches: Fail cleanly when expire cannot open the patches directories.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: tools Branch: master Commit: fe3b6ec5e296af486340bac3f9a52c39833fbf2c URL: http://source.winehq.org/git/tools.git/?a=commit;h=fe3b6ec5e296af486340bac3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 7 18:32:54 2013 +0100 patches: Fail cleanly when expire cannot open the patches directories. --- patches/expire | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/expire b/patches/expire index c4d49f3..05aee19 100755 --- a/patches/expire +++ b/patches/expire @@ -100,7 +100,7 @@ sub get_patch_state($) # expire current patches -opendir DIR, $dir; +opendir DIR, $dir or die "cannot open '$dir': $!\n"; foreach my $file (sort readdir DIR) { next unless $file =~ /^[0-9]+$/; @@ -140,7 +140,7 @@ closedir DIR; # expire old patches whose status has changed -opendir DIR, "$dir/OLD"; +opendir DIR, "$dir/OLD" or die "cannot open '$dir/OLD': $!\n"; foreach my $file (sort readdir DIR) { next unless $file =~ /^[0-9]+$/;

1 0

Jacek Caban : wininet: Fixed crash in chunked_read if netconn is not available.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 7d8c8af9d71dc8ecf6a07ec19dfbc0deb108f8e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d8c8af9d71dc8ecf6a07ec19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 7 16:32:43 2013 +0100 wininet: Fixed crash in chunked_read if netconn is not available. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8fec2a4..890adce 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2643,7 +2643,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, if(read_mode == READMODE_NOBLOCK) { DWORD avail; - if(!NETCON_query_data_available(req->netconn, &avail) || !avail) + if(!req->netconn || !NETCON_query_data_available(req->netconn, &avail) || !avail) break; if(read_bytes > avail) read_bytes = avail;

1 0

Nozomi Kodama : d3dx9: Save multiplications for better performance.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 479195ea41e6360182b6f61f6a3262caa1e24255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=479195ea41e6360182b6f61f6… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Mon Mar 4 00:56:53 2013 -1000 d3dx9: Save multiplications for better performance. --- dlls/d3dx9_36/math.c | 80 ++++++++++++++++++++++++++++---------------------- 1 files changed, 45 insertions(+), 35 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 5603c0b..8adabb3 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2378,60 +2378,70 @@ HRESULT WINAPI D3DXSHEvalConeLight(UINT order, const D3DXVECTOR3 *dir, FLOAT rad FLOAT* WINAPI D3DXSHEvalDirection(FLOAT *out, UINT order, const D3DXVECTOR3 *dir) { + const FLOAT dirxx = dir->x * dir->x; + const FLOAT dirxy = dir->x * dir->y; + const FLOAT dirxz = dir->x * dir->z; + const FLOAT diryy = dir->y * dir->y; + const FLOAT diryz = dir->y * dir->z; + const FLOAT dirzz = dir->z * dir->z; + const FLOAT dirxxxx = dirxx * dirxx; + const FLOAT diryyyy = diryy * diryy; + const FLOAT dirzzzz = dirzz * dirzz; + const FLOAT dirxyxy = dirxy * dirxy; TRACE("out %p, order %u, dir %p\n", out, order, dir); - if ( (order < D3DXSH_MINORDER) || (order > D3DXSH_MAXORDER) ) + if ((order < D3DXSH_MINORDER) || (order > D3DXSH_MAXORDER)) return out; out[0] = 0.5f / sqrt(D3DX_PI); out[1] = -0.5f / sqrt(D3DX_PI / 3.0f) * dir->y; out[2] = 0.5f / sqrt(D3DX_PI / 3.0f) * dir->z; out[3] = -0.5f / sqrt(D3DX_PI / 3.0f) * dir->x; - if ( order == 2 ) + if (order == 2) return out; - out[4] = 0.5f / sqrt(D3DX_PI / 15.0f) * dir->x * dir->y; - out[5] = -0.5f / sqrt(D3DX_PI / 15.0f) * dir->y * dir->z; - out[6] = 0.25f / sqrt(D3DX_PI / 5.0f) * ( 3.0f * dir->z * dir->z - 1.0f ); - out[7] = -0.5f / sqrt(D3DX_PI / 15.0f) * dir->x * dir->z; - out[8] = 0.25f / sqrt(D3DX_PI / 15.0f) * ( dir->x * dir->x - dir->y * dir->y ); - if ( order == 3 ) + out[4] = 0.5f / sqrt(D3DX_PI / 15.0f) * dirxy; + out[5] = -0.5f / sqrt(D3DX_PI / 15.0f) * diryz; + out[6] = 0.25f / sqrt(D3DX_PI / 5.0f) * (3.0f * dirzz - 1.0f); + out[7] = -0.5f / sqrt(D3DX_PI / 15.0f) * dirxz; + out[8] = 0.25f / sqrt(D3DX_PI / 15.0f) * (dirxx - diryy); + if (order == 3) return out; - out[9] = -sqrt(70.0f / D3DX_PI) / 8.0f * dir->y * (3.0f * dir->x * dir->x - dir->y * dir->y ); - out[10] = sqrt(105.0f / D3DX_PI) / 2.0f * dir->x * dir->y * dir->z; - out[11] = -sqrt(42.0 / D3DX_PI) / 8.0f * dir->y * ( -1.0f + 5.0f * dir->z * dir->z ); - out[12] = sqrt(7.0f / D3DX_PI) / 4.0f * dir->z * ( 5.0f * dir->z * dir->z - 3.0f ); - out[13] = sqrt(42.0 / D3DX_PI) / 8.0f * dir->x * ( 1.0f - 5.0f * dir->z * dir->z ); - out[14] = sqrt(105.0f / D3DX_PI) / 4.0f * dir->z * ( dir->x * dir->x - dir->y * dir->y ); - out[15] = -sqrt(70.0f / D3DX_PI) / 8.0f * dir->x * ( dir->x * dir->x - 3.0f * dir->y * dir->y ); - if ( order == 4 ) + out[9] = -sqrt(70.0f / D3DX_PI) / 8.0f * dir->y * (3.0f * dirxx - diryy); + out[10] = sqrt(105.0f / D3DX_PI) / 2.0f * dirxy * dir->z; + out[11] = -sqrt(42.0 / D3DX_PI) / 8.0f * dir->y * (-1.0f + 5.0f * dirzz); + out[12] = sqrt(7.0f / D3DX_PI) / 4.0f * dir->z * (5.0f * dirzz - 3.0f); + out[13] = sqrt(42.0 / D3DX_PI) / 8.0f * dir->x * (1.0f - 5.0f * dirzz); + out[14] = sqrt(105.0f / D3DX_PI) / 4.0f * dir->z * (dirxx - diryy); + out[15] = -sqrt(70.0f / D3DX_PI) / 8.0f * dir->x * (dirxx - 3.0f * diryy); + if (order == 4) return out; - out[16] = 0.75f * sqrt(35.0f / D3DX_PI) * dir->x * dir->y * (dir->x * dir->x - dir->y * dir->y ); + out[16] = 0.75f * sqrt(35.0f / D3DX_PI) * dirxy * (dirxx - diryy); out[17] = 3.0f * dir->z * out[9]; - out[18] = 0.75f * sqrt(5.0f / D3DX_PI) * dir->x * dir->y * ( 7.0f * dir->z * dir->z - 1.0f ); - out[19] = 0.375f * sqrt(10.0f / D3DX_PI) * dir->y * dir->z * ( 3.0f - 7.0f * dir->z * dir->z ); - out[20] = 3.0f / ( 16.0f * sqrt(D3DX_PI) ) * ( 35.0f * dir->z * dir->z * dir->z * dir->z - 30.f * dir->z * dir->z + 3.0f ); - out[21] = 0.375f * sqrt(10.0f / D3DX_PI) * dir->x * dir->z * ( 3.0f - 7.0f * dir->z * dir->z ); - out[22] = 0.375f * sqrt(5.0f / D3DX_PI) * ( dir->x * dir->x - dir->y * dir->y ) * ( 7.0f * dir->z * dir->z - 1.0f); + out[18] = 0.75f * sqrt(5.0f / D3DX_PI) * dirxy * (7.0f * dirzz - 1.0f); + out[19] = 0.375f * sqrt(10.0f / D3DX_PI) * diryz * (3.0f - 7.0f * dirzz); + out[20] = 3.0f / (16.0f * sqrt(D3DX_PI)) * (35.0f * dirzzzz - 30.f * dirzz + 3.0f); + out[21] = 0.375f * sqrt(10.0f / D3DX_PI) * dirxz * (3.0f - 7.0f * dirzz); + out[22] = 0.375f * sqrt(5.0f / D3DX_PI) * (dirxx - diryy) * (7.0f * dirzz - 1.0f); out[23] = 3.0 * dir->z * out[15]; - out[24] = 3.0f / 16.0f * sqrt(35.0f / D3DX_PI) * ( dir->x * dir->x * dir->x * dir->x- 6.0f * dir->x * dir->x * dir->y * dir->y + dir->y * dir->y * dir->y * dir->y ); - if ( order == 5 ) + out[24] = 3.0f / 16.0f * sqrt(35.0f / D3DX_PI) * (dirxxxx - 6.0f * dirxyxy + diryyyy); + if (order == 5) return out; - out[25] = -3.0f/ 32.0f * sqrt(154.0f / D3DX_PI) * dir->y * ( 5.0f * dir->x * dir->x * dir->x * dir->x - 10.0f * dir->x * dir->x * dir->y * dir->y + dir->y * dir->y * dir->y * dir->y ); - out[26] = 0.75f * sqrt(385.0f / D3DX_PI) * dir->x * dir->y * dir->z * ( dir->x * dir->x - dir->y * dir->y ); - out[27] = sqrt(770.0f / D3DX_PI) / 32.0f * dir->y * ( 3.0f * dir->x * dir->x - dir->y * dir->y ) * ( 1.0f - 9.0f * dir->z * dir->z ); - out[28] = sqrt(1155.0f / D3DX_PI) / 4.0f * dir->x * dir->y * dir->z * ( 3.0f * dir->z * dir->z - 1.0f); - out[29] = sqrt(165.0f / D3DX_PI) / 16.0f * dir->y * ( 14.0f * dir->z * dir->z - 21.0f * dir->z * dir->z * dir->z * dir->z - 1.0f ); - out[30] = sqrt(11.0f / D3DX_PI) / 16.0f * dir->z * ( 63.0f * dir->z * dir->z * dir->z * dir->z - 70.0f * dir->z * dir->z + 15.0f ); - out[31] = sqrt(165.0f / D3DX_PI) / 16.0f * dir->x * ( 14.0f * dir->z * dir->z - 21.0f * dir->z * dir->z * dir->z * dir->z - 1.0f ); - out[32] = sqrt(1155.0f / D3DX_PI) / 8.0f * dir->z * ( dir->x * dir->x - dir->y * dir->y ) * ( 3.0f * dir->z * dir->z - 1.0f ); - out[33] = sqrt(770.0f / D3DX_PI) / 32.0f * dir->x * ( dir->x * dir->x - 3.0f * dir->y * dir->y ) * ( 1.0f - 9.0f * dir->z * dir->z ); - out[34] = 3.0f / 16.0f * sqrt(385.0f / D3DX_PI) * dir->z * ( dir->x * dir->x * dir->x * dir->x - 6.0 * dir->x * dir->x * dir->y * dir->y + dir->y * dir->y * dir->y * dir->y ); - out[35] = -3.0f/ 32.0f * sqrt(154.0f / D3DX_PI) * dir->x * ( dir->x * dir->x * dir->x * dir->x - 10.0f * dir->x * dir->x * dir->y * dir->y + 5.0f * dir->y * dir->y * dir->y * dir->y ); + out[25] = -3.0f/ 32.0f * sqrt(154.0f / D3DX_PI) * dir->y * (5.0f * dirxxxx - 10.0f * dirxyxy + diryyyy); + out[26] = 0.75f * sqrt(385.0f / D3DX_PI) * dirxy * dir->z * (dirxx - diryy); + out[27] = sqrt(770.0f / D3DX_PI) / 32.0f * dir->y * (3.0f * dirxx - diryy) * (1.0f - 9.0f * dirzz); + out[28] = sqrt(1155.0f / D3DX_PI) / 4.0f * dirxy * dir->z * (3.0f * dirzz - 1.0f); + out[29] = sqrt(165.0f / D3DX_PI) / 16.0f * dir->y * (14.0f * dirzz - 21.0f * dirzzzz - 1.0f); + out[30] = sqrt(11.0f / D3DX_PI) / 16.0f * dir->z * (63.0f * dirzzzz - 70.0f * dirzz + 15.0f); + out[31] = sqrt(165.0f / D3DX_PI) / 16.0f * dir->x * (14.0f * dirzz - 21.0f * dirzzzz - 1.0f); + out[32] = sqrt(1155.0f / D3DX_PI) / 8.0f * dir->z * (dirxx - diryy) * (3.0f * dirzz - 1.0f); + out[33] = sqrt(770.0f / D3DX_PI) / 32.0f * dir->x * (dirxx - 3.0f * diryy) * (1.0f - 9.0f * dirzz); + out[34] = 3.0f / 16.0f * sqrt(385.0f / D3DX_PI) * dir->z * (dirxxxx - 6.0 * dirxyxy + diryyyy); + out[35] = -3.0f/ 32.0f * sqrt(154.0f / D3DX_PI) * dir->x * (dirxxxx - 10.0f * dirxyxy + 5.0f * diryyyy); return out; }

1 0

Nozomi Kodama : d3dx9: Implement D3DXSHEvalConeLight.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 9085f1d27f4f8b979f2657a20b445d9a3384ba5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9085f1d27f4f8b979f2657a20… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Mon Mar 4 00:55:50 2013 -1000 d3dx9: Implement D3DXSHEvalConeLight. --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 73 +++++++++++++++++++ dlls/d3dx9_36/tests/math.c | 161 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- include/d3dx9math.h | 1 + 23 files changed, 255 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9085f1d27f4f8b979f265…

1 0

Hans Leidekker : winhttp: Make the first parameter of resolve_hostname const.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 9e019c9b4b930b892f09e0b497b1ed68ae40c7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e019c9b4b930b892f09e0b49… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 7 14:50:48 2013 +0100 winhttp: Make the first parameter of resolve_hostname const. --- dlls/winhttp/net.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 2177416..9fca4b5 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -843,7 +843,7 @@ DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) return ERROR_SUCCESS; } -static DWORD resolve_hostname( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa, socklen_t *sa_len ) +static DWORD resolve_hostname( const WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa, socklen_t *sa_len ) { char *hostname; #ifdef HAVE_GETADDRINFO @@ -928,7 +928,7 @@ static DWORD resolve_hostname( WCHAR *hostnameW, INTERNET_PORT port, struct sock struct resolve_args { - WCHAR *hostname; + const WCHAR *hostname; INTERNET_PORT port; struct sockaddr *sa; socklen_t *sa_len;

1 0

Dmitry Timoshkov : windowscodecs: Ask libpng to ignore CRC of PNG chunks.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: ec22949874f9051eff6209fde43346a4bb5997fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec22949874f9051eff6209fde… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 7 15:26:13 2013 +0900 windowscodecs: Ask libpng to ignore CRC of PNG chunks. According to my tests with manually created PNG images WIC ignores CRC errors for both critical and ancillary chunks. --- dlls/windowscodecs/pngformat.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index fb8bf51..2f6a9e3 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -174,6 +174,7 @@ MAKE_FUNCPTR(png_get_pHYs); MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); MAKE_FUNCPTR(png_set_bgr); +MAKE_FUNCPTR(png_set_crc_action); MAKE_FUNCPTR(png_set_error_fn); #if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 MAKE_FUNCPTR(png_set_expand_gray_1_2_4_to_8); @@ -222,6 +223,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_PLTE); LOAD_FUNCPTR(png_get_tRNS); LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_set_crc_action); LOAD_FUNCPTR(png_set_error_fn); #if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 LOAD_FUNCPTR(png_set_expand_gray_1_2_4_to_8); @@ -438,6 +440,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p goto end; } ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn); + ppng_set_crc_action(This->png_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE); /* seek to the start of the stream */ seek.QuadPart = 0;

1 0

Alistair Leslie-Hughes : msxml3: Add xmlns attribute test.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 461951e3d4427cfa702a9cfea199d777fa9dcd49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=461951e3d4427cfa702a9cfea… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 5 09:21:03 2013 +1100 msxml3: Add xmlns attribute test. --- dlls/msxml3/tests/domdoc.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d69547f..8775312 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10754,6 +10754,61 @@ static void test_nodeValue(void) IXMLDOMDocument_Release(doc); } +void test_xmlns_attribute(void) +{ + BSTR str; + IXMLDOMDocument *doc; + IXMLDOMElement *root; + IXMLDOMAttribute *pAttribute; + IXMLDOMElement *elem; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &root); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL); + EXPECT_HR(hr, S_OK); + + str = SysAllocString(szAttribute); + hr = IXMLDOMDocument_createAttribute(doc, _bstr_("xmlns:dt"), &pAttribute); + ok( hr == S_OK, "returns %08x\n", hr ); + if(hr == S_OK) + { + VARIANT v; + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("urn:schemas-microsoft-com:datatypes"); + hr = IXMLDOMAttribute_put_nodeValue(pAttribute, v); + + hr = IXMLDOMElement_setAttributeNode(root, pAttribute, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMNode_put_dataType((IXMLDOMNode*)root, _bstr_("bin.base64")); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_get_xml(elem, &str); + ok( hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok( lstrcmpW(str, _bstr_("<Testing xmlns:dt=\"urn:schemas-microsoft-com:datatypes\" dt:dt=\"bin.base64\"/>")) == 0, + "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMElement_Release(elem); + IXMLDOMAttribute_Release( pAttribute); + } + + SysFreeString(str); + + IXMLDOMDocument_Release(doc); + + free_bstrs(); +} + static const char namespacesA[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" " <ns1:elem1 xmlns:ns1=\"http://blah.org\" b='1' >" @@ -11461,6 +11516,7 @@ START_TEST(domdoc) test_put_data(); test_putref_schemas(); test_namedmap_newenum(); + test_xmlns_attribute(); test_xsltemplate(); test_xsltext();

1 0

Jacek Caban : jscript: Use (index,length) pair as match result.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: c3eecec680593e50314a0bc35757969f09d000f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3eecec680593e50314a0bc35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 7 11:03:23 2013 +0100 jscript: Use (index,length) pair as match result. --- dlls/jscript/jscript.h | 4 ++-- dlls/jscript/jsregexp.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 35e2c3f..135b77f 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -362,8 +362,8 @@ typedef struct { } jsexcept_t; typedef struct { - const WCHAR *str; - DWORD len; + unsigned index; + unsigned length; } match_result_t; struct _script_ctx_t { diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index f9b9992..43df35a 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -98,11 +98,11 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, for(i=0; i < n; i++) { if(ret->parens[i].index == -1) { - ctx->match_parens[i].str = NULL; - ctx->match_parens[i].len = 0; + ctx->match_parens[i].index = 0; + ctx->match_parens[i].length = 0; }else { - ctx->match_parens[i].str = ctx->last_match->str + ret->parens[i].index; - ctx->match_parens[i].len = ret->parens[i].length; + ctx->match_parens[i].index = ret->parens[i].index; + ctx->match_parens[i].length = ret->parens[i].length; } } @@ -216,8 +216,8 @@ static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, jsstr_t *str, B } } - ret[i].str = result->cp - result->match_len; - ret[i++].len = result->match_len; + ret[i].index = result->cp - str->str - result->match_len; + ret[i++].length = result->match_len; if(!gflag && !(This->jsregexp->flags & REG_GLOB)) { hres = S_OK; @@ -736,7 +736,7 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *str, jsval for(i=0; i < match_cnt; i++) { jsstr_t *tmp_str; - tmp_str = jsstr_alloc_len(match_result[i].str, match_result[i].len); + tmp_str = jsstr_substr(str, match_result[i].index, match_result[i].length); if(!tmp_str) { hres = E_OUTOFMEMORY; break; @@ -749,12 +749,12 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *str, jsval } while(SUCCEEDED(hres)) { - hres = jsdisp_propput_name(array, indexW, jsval_number(match_result[match_cnt-1].str-str->str)); + hres = jsdisp_propput_name(array, indexW, jsval_number(match_result[match_cnt-1].index)); if(FAILED(hres)) break; hres = jsdisp_propput_name(array, lastIndexW, - jsval_number(match_result[match_cnt-1].str-str->str+match_result[match_cnt-1].len)); + jsval_number(match_result[match_cnt-1].index + match_result[match_cnt-1].length)); if(FAILED(hres)) break; @@ -777,7 +777,7 @@ static HRESULT global_idx(script_ctx_t *ctx, DWORD flags, DWORD idx, jsval_t *r) case DISPATCH_PROPERTYGET: { jsstr_t *ret; - ret = jsstr_alloc_len(ctx->match_parens[idx].str, ctx->match_parens[idx].len); + ret = jsstr_substr(ctx->last_match, ctx->match_parens[idx].index, ctx->match_parens[idx].length); if(!ret) return E_OUTOFMEMORY;

1 0

Jacek Caban : urlmon: Added HTTP cache reading tests.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 4d92d604e074f82e53c52aef98bdd1c0c203f91d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d92d604e074f82e53c52aef9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 7 16:29:58 2013 +0100 urlmon: Added HTTP cache reading tests. --- dlls/urlmon/tests/Makefile.in | 2 +- dlls/urlmon/tests/protocol.c | 121 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 118 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d92d604e074f82e53c52…

1 0

Jacek Caban : urlmon: Fixed handling binding reading immediately from cache .
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 7483f975de90cf13028c689460145d1a92f18ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7483f975de90cf13028c68946… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 7 16:29:48 2013 +0100 urlmon: Fixed handling binding reading immediately from cache. --- dlls/urlmon/http.c | 15 ++++++-- dlls/urlmon/protocol.c | 81 ++++++++++++++++++++++++++++++--------------- dlls/urlmon/urlmon_main.h | 2 + 3 files changed, 67 insertions(+), 31 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index b2c3d10..d5cef5c 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -445,11 +445,18 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques do { error = send_http_request(This); - if(error == ERROR_IO_PENDING || error == ERROR_SUCCESS) + switch(error) { + case ERROR_IO_PENDING: return S_OK; - - hres = handle_http_error(This, error); - + case ERROR_SUCCESS: + /* + * If sending response ended synchronously, it means that we have the whole data + * available locally (most likely in cache). + */ + return protocol_syncbinding(&This->base); + default: + hres = handle_http_error(This, error); + } } while(hres == RPC_E_RETRY); WARN("HttpSendRequest failed: %d\n", error); diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 890d013..5598780 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -70,6 +70,55 @@ static void all_data_read(Protocol *protocol) report_result(protocol, S_OK); } +static HRESULT start_downloading(Protocol *protocol) +{ + HRESULT hres; + + hres = protocol->vtbl->start_downloading(protocol); + if(FAILED(hres)) { + protocol_close_connection(protocol); + report_result(protocol, hres); + return S_OK; + } + + if(protocol->bindf & BINDF_NEEDFILE) { + WCHAR cache_file[MAX_PATH]; + DWORD buflen = sizeof(cache_file); + + if(InternetQueryOptionW(protocol->request, INTERNET_OPTION_DATAFILE_NAME, cache_file, &buflen)) { + report_progress(protocol, BINDSTATUS_CACHEFILENAMEAVAILABLE, cache_file); + }else { + FIXME("Could not get cache file\n"); + } + } + + protocol->flags |= FLAG_FIRST_CONTINUE_COMPLETE; + return S_OK; +} + +HRESULT protocol_syncbinding(Protocol *protocol) +{ + BOOL res; + HRESULT hres; + + protocol->flags |= FLAG_SYNC_READ; + + hres = start_downloading(protocol); + if(FAILED(hres)) + return hres; + + res = InternetQueryDataAvailable(protocol->request, &protocol->query_available, 0, 0); + if(res) + protocol->available_bytes = protocol->query_available; + else + WARN("InternetQueryDataAvailable failed: %u\n", GetLastError()); + + protocol->flags |= FLAG_FIRST_DATA_REPORTED|FLAG_LAST_DATA_REPORTED; + IInternetProtocolSink_ReportData(protocol->protocol_sink, BSCF_LASTDATANOTIFICATION|BSCF_DATAFULLYAVAILABLE, + protocol->available_bytes, protocol->content_length); + return S_OK; +} + static void request_complete(Protocol *protocol, INTERNET_ASYNC_RESULT *ar) { PROTOCOLDATA data; @@ -298,12 +347,7 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) BOOL is_start; HRESULT hres; - if (!data) { - WARN("Expected pProtocolData to be non-NULL\n"); - return S_OK; - } - - is_start = data->pData == UlongToPtr(BINDSTATUS_DOWNLOADINGDATA); + is_start = !data || data->pData == UlongToPtr(BINDSTATUS_DOWNLOADINGDATA); if(!protocol->request) { WARN("Expected request to be non-NULL\n"); @@ -325,29 +369,12 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) return write_post_stream(protocol); if(is_start) { - hres = protocol->vtbl->start_downloading(protocol); - if(FAILED(hres)) { - protocol_close_connection(protocol); - report_result(protocol, hres); + hres = start_downloading(protocol); + if(FAILED(hres)) return S_OK; - } - - if(protocol->bindf & BINDF_NEEDFILE) { - WCHAR cache_file[MAX_PATH]; - DWORD buflen = sizeof(cache_file); - - if(InternetQueryOptionW(protocol->request, INTERNET_OPTION_DATAFILE_NAME, - cache_file, &buflen)) { - report_progress(protocol, BINDSTATUS_CACHEFILENAMEAVAILABLE, cache_file); - }else { - FIXME("Could not get cache file\n"); - } - } - - protocol->flags |= FLAG_FIRST_CONTINUE_COMPLETE; } - if(data->pData >= UlongToPtr(BINDSTATUS_DOWNLOADINGDATA)) { + if(!data || data->pData >= UlongToPtr(BINDSTATUS_DOWNLOADINGDATA)) { if(!protocol->available_bytes) { if(protocol->query_available) { protocol->available_bytes = protocol->query_available; @@ -400,7 +427,7 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret return S_FALSE; } - if(!(protocol->flags & FLAG_REQUEST_COMPLETE) || !protocol->available_bytes) { + if(!(protocol->flags & FLAG_SYNC_READ) && (!(protocol->flags & FLAG_REQUEST_COMPLETE) || !protocol->available_bytes)) { *read_ret = 0; return E_PENDING; } diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index ba23e74..faab45a 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -149,6 +149,7 @@ struct ProtocolVtbl { #define FLAG_LAST_DATA_REPORTED 0x0010 #define FLAG_RESULT_REPORTED 0x0020 #define FLAG_ERROR 0x0040 +#define FLAG_SYNC_READ 0x0080 HRESULT protocol_start(Protocol*,IInternetProtocol*,IUri*,IInternetProtocolSink*,IInternetBindInfo*) DECLSPEC_HIDDEN; HRESULT protocol_continue(Protocol*,PROTOCOLDATA*) DECLSPEC_HIDDEN; @@ -156,6 +157,7 @@ HRESULT protocol_read(Protocol*,void*,ULONG,ULONG*) DECLSPEC_HIDDEN; HRESULT protocol_lock_request(Protocol*) DECLSPEC_HIDDEN; HRESULT protocol_unlock_request(Protocol*) DECLSPEC_HIDDEN; HRESULT protocol_abort(Protocol*,HRESULT) DECLSPEC_HIDDEN; +HRESULT protocol_syncbinding(Protocol*) DECLSPEC_HIDDEN; void protocol_close_connection(Protocol*) DECLSPEC_HIDDEN; void find_domain_name(const WCHAR*,DWORD,INT*) DECLSPEC_HIDDEN;

1 0

Piotr Caban : wininet: Rename URLCacheContainer_* functions to cache_container_*.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 36ce3d256dbe7df42ca2a62ce9f11c6bdea74584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36ce3d256dbe7df42ca2a62ce… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 7 13:50:27 2013 +0100 wininet: Rename URLCacheContainer_* functions to cache_container_*. --- dlls/wininet/urlcache.c | 174 +++++++++++++++++++++++----------------------- 1 files changed, 87 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36ce3d256dbe7df42ca2a…

1 0

Piotr Caban : wininet: Cleanup and optimize URLCacheContainer_OpenIndex function.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 8a06b11f76bd1d2af47f4ba672648b3309c1fa62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a06b11f76bd1d2af47f4ba67… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 7 13:50:01 2013 +0100 wininet: Cleanup and optimize URLCacheContainer_OpenIndex function. --- dlls/wininet/urlcache.c | 485 ++++++++++++++++++++++------------------------- 1 files changed, 226 insertions(+), 259 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a06b11f76bd1d2af47f4…

1 0

Jacek Caban : jscript: Use jsstr_flush in literal_as_bstr.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 324d8b6fa3efcd49f520f0df40cfc930c5338020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=324d8b6fa3efcd49f520f0df4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 7 11:03:34 2013 +0100 jscript: Use jsstr_flush in literal_as_bstr. --- dlls/jscript/compile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index c776c83..53ed9e7 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -791,7 +791,9 @@ static HRESULT literal_as_bstr(compiler_ctx_t *ctx, literal_t *literal, BSTR *st if(FAILED(hres)) return hres; - *str = compiler_alloc_bstr(ctx, jsstr->str); + *str = compiler_alloc_bstr_len(ctx, NULL, jsstr_length(jsstr)); + if(*str) + jsstr_flush(jsstr, *str); jsstr_release(jsstr); break; }

1 0

Petr Kočandrle : po: Completed winecfg and clock Czech translation.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: c496899deff2c3ce8759145a8a2599b957dd3daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c496899deff2c3ce8759145a8… Author: Petr Kočandrle <petr.kocandrle(a)gmail.com> Date: Thu Mar 7 00:15:36 2013 +0100 po: Completed winecfg and clock Czech translation. --- po/cs.po | 132 +++++++++++++++++++++++++------------------------------------- 1 files changed, 53 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c496899deff2c3ce87591…

1 0