winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
July 2010
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
892 discussions
Start a n
N
ew thread
Alexandre Julliard : gdi32: Reject invalid DIB depths in CreateDIBSection.
by Alexandre Julliard
20 Jul '10
20 Jul '10
Module: wine Branch: master Commit: 811cdfaf2715c3784f947e70907fc68454bb5e8e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=811cdfaf2715c3784f947e709…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 20 14:28:51 2010 +0200 gdi32: Reject invalid DIB depths in CreateDIBSection. --- dlls/gdi32/dib.c | 5 +-- dlls/gdi32/tests/bitmap.c | 2 +- dlls/gdiplus/tests/graphics.c | 57 +++++++++++++++++++++++----------------- 3 files changed, 36 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index ce5ab8b..bf36986 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1261,11 +1261,10 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, case 8: case 24: if (compression == BI_RGB) break; + /* fall through */ + default: WARN( "invalid %u bpp compression %u\n", bpp, compression ); return 0; - default: - FIXME( "should fail %u bpp compression %u\n", bpp, compression ); - break; } if (!(dib = HeapAlloc( GetProcessHeap(), 0, sizeof(*dib) ))) return 0; diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 8e5ad2e..3be5734 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -554,7 +554,7 @@ static void test_dibsections(void) if (i == 1 || i == 4 || i == 8 || i == 16 || i == 24 || i == 32) ok(hdib != NULL, "CreateDIBSection bpp %u\n", i); else - todo_wine ok(hdib == NULL, "CreateDIBSection bpp %u succeeded\n", i); + ok(hdib == NULL, "CreateDIBSection bpp %u succeeded\n", i); if (hdib) DeleteObject( hdib ); } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index aaf661d..16f0d31 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2346,34 +2346,43 @@ static void test_GdipGetNearestColor(void) GdipDisposeImage((GpImage*)bitmap); status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat48bppRGB, NULL, &bitmap); - expect(Ok, status); - status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); - expect(Ok, status); - status = GdipGetNearestColor(graphics, &color); - expect(Ok, status); - expect(0xdeadbeef, color); - GdipDeleteGraphics(graphics); - GdipDisposeImage((GpImage*)bitmap); + todo_wine expect(Ok, status); + if (status == Ok) + { + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + status = GdipGetNearestColor(graphics, &color); + expect(Ok, status); + expect(0xdeadbeef, color); + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); + } status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat64bppARGB, NULL, &bitmap); - expect(Ok, status); - status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); - expect(Ok, status); - status = GdipGetNearestColor(graphics, &color); - expect(Ok, status); - expect(0xdeadbeef, color); - GdipDeleteGraphics(graphics); - GdipDisposeImage((GpImage*)bitmap); + todo_wine expect(Ok, status); + if (status == Ok) + { + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + status = GdipGetNearestColor(graphics, &color); + expect(Ok, status); + expect(0xdeadbeef, color); + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); + } status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat64bppPARGB, NULL, &bitmap); - expect(Ok, status); - status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); - expect(Ok, status); - status = GdipGetNearestColor(graphics, &color); - expect(Ok, status); - expect(0xdeadbeef, color); - GdipDeleteGraphics(graphics); - GdipDisposeImage((GpImage*)bitmap); + todo_wine expect(Ok, status); + if (status == Ok) + { + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + status = GdipGetNearestColor(graphics, &color); + expect(Ok, status); + expect(0xdeadbeef, color); + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); + } status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat16bppRGB565, NULL, &bitmap); expect(Ok, status);
1
0
0
0
Piotr Caban : wininet: Allow HTTPREQ_ReadFileEx read more then one data chunk.
by Alexandre Julliard
20 Jul '10
20 Jul '10
Module: wine Branch: master Commit: 21ced8ddc890f94c847ca35245ea4329f2c339e6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=21ced8ddc890f94c847ca3524…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 20 00:33:24 2010 +0200 wininet: Allow HTTPREQ_ReadFileEx read more then one data chunk. --- dlls/wininet/http.c | 105 ++++++++++++++++++++++++++++++++++++++++++----- dlls/wininet/internet.h | 2 + 2 files changed, 96 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a32be25..80bacb4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2241,7 +2241,18 @@ done: static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DWORD *read) { http_request_t *req = (http_request_t*)hdr; - return HTTPREQ_Read(req, buffer, size, read, TRUE); + DWORD res; + + EnterCriticalSection( &req->read_section ); + if(hdr->dwError == INTERNET_HANDLE_IN_USE) + hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; + + res = HTTPREQ_Read(req, buffer, size, read, TRUE); + if(res == ERROR_SUCCESS) + res = hdr->dwError; + LeaveCriticalSection( &req->read_section ); + + return res; } static void HTTPREQ_AsyncReadFileExAProc(WORKREQUEST *workRequest) @@ -2268,7 +2279,7 @@ static DWORD HTTPREQ_ReadFileExA(object_header_t *hdr, INTERNET_BUFFERSA *buffer DWORD flags, DWORD_PTR context) { http_request_t *req = (http_request_t*)hdr; - DWORD res; + DWORD res, size, read, error = ERROR_SUCCESS; if (flags & ~(IRF_ASYNC|IRF_NO_WAIT)) FIXME("these dwFlags aren't implemented: 0x%x\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT)); @@ -2288,6 +2299,7 @@ static DWORD HTTPREQ_ReadFileExA(object_header_t *hdr, INTERNET_BUFFERSA *buffer { res = HTTPREQ_Read(req, buffers->lpvBuffer, buffers->dwBufferLength, &buffers->dwBufferLength, FALSE); + size = buffers->dwBufferLength; LeaveCriticalSection( &req->read_section ); goto done; } @@ -2303,17 +2315,52 @@ static DWORD HTTPREQ_ReadFileExA(object_header_t *hdr, INTERNET_BUFFERSA *buffer return ERROR_IO_PENDING; } - res = HTTPREQ_Read(req, buffers->lpvBuffer, buffers->dwBufferLength, &buffers->dwBufferLength, - !(flags & IRF_NO_WAIT)); + read = 0; + size = buffers->dwBufferLength; + + EnterCriticalSection( &req->read_section ); + if(hdr->dwError == ERROR_SUCCESS) + hdr->dwError = INTERNET_HANDLE_IN_USE; + else if(hdr->dwError == INTERNET_HANDLE_IN_USE) + hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; + + while(1) { + res = HTTPREQ_Read(req, (char*)buffers->lpvBuffer+read, size-read, + &buffers->dwBufferLength, !(flags & IRF_NO_WAIT)); + if(res == ERROR_SUCCESS) + read += buffers->dwBufferLength; + else + break; + + if(!req->read_chunked || read==size || req->dwContentLength!=req->dwContentRead + || !req->dwContentLength || (req->gzip_stream && req->gzip_stream->end_of_data)) + break; + LeaveCriticalSection( &req->read_section ); + + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, + &buffers->dwBufferLength, sizeof(buffers->dwBufferLength)); + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, + INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); + + EnterCriticalSection( &req->read_section ); + } + + if(hdr->dwError == INTERNET_HANDLE_IN_USE) + hdr->dwError = ERROR_SUCCESS; + else + error = hdr->dwError; + + LeaveCriticalSection( &req->read_section ); + size = buffers->dwBufferLength; + buffers->dwBufferLength = read; done: if (res == ERROR_SUCCESS) { - DWORD size = buffers->dwBufferLength; INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, &size, sizeof(size)); } - return res; + return res==ERROR_SUCCESS ? error : res; } static void HTTPREQ_AsyncReadFileExWProc(WORKREQUEST *workRequest) @@ -2341,7 +2388,7 @@ static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffer { http_request_t *req = (http_request_t*)hdr; - DWORD res; + DWORD res, size, read, error = ERROR_SUCCESS; if (flags & ~(IRF_ASYNC|IRF_NO_WAIT)) FIXME("these dwFlags aren't implemented: 0x%x\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT)); @@ -2361,6 +2408,7 @@ static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffer { res = HTTPREQ_Read(req, buffers->lpvBuffer, buffers->dwBufferLength, &buffers->dwBufferLength, FALSE); + size = buffers->dwBufferLength; LeaveCriticalSection( &req->read_section ); goto done; } @@ -2376,17 +2424,52 @@ static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffer return ERROR_IO_PENDING; } - res = HTTPREQ_Read(req, buffers->lpvBuffer, buffers->dwBufferLength, &buffers->dwBufferLength, - !(flags & IRF_NO_WAIT)); + read = 0; + size = buffers->dwBufferLength; + + EnterCriticalSection( &req->read_section ); + if(hdr->dwError == ERROR_SUCCESS) + hdr->dwError = INTERNET_HANDLE_IN_USE; + else if(hdr->dwError == INTERNET_HANDLE_IN_USE) + hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; + + while(1) { + res = HTTPREQ_Read(req, (char*)buffers->lpvBuffer+read, size-read, + &buffers->dwBufferLength, !(flags & IRF_NO_WAIT)); + if(res == ERROR_SUCCESS) + read += buffers->dwBufferLength; + else + break; + + if(!req->read_chunked || read==size || req->dwContentLength!=req->dwContentRead + || !req->dwContentLength || (req->gzip_stream && req->gzip_stream->end_of_data)) + break; + LeaveCriticalSection( &req->read_section ); + + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, + &buffers->dwBufferLength, sizeof(buffers->dwBufferLength)); + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, + INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); + + EnterCriticalSection( &req->read_section ); + } + + if(hdr->dwError == INTERNET_HANDLE_IN_USE) + hdr->dwError = ERROR_SUCCESS; + else + error = hdr->dwError; + + LeaveCriticalSection( &req->read_section ); + size = buffers->dwBufferLength; + buffers->dwBufferLength = read; done: if (res == ERROR_SUCCESS) { - DWORD size = buffers->dwBufferLength; INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, &size, sizeof(size)); } - return res; + return res==ERROR_SUCCESS ? error : res; } static DWORD HTTPREQ_WriteFile(object_header_t *hdr, const void *buffer, DWORD size, DWORD *written) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 6e41f66..40de22f 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -169,6 +169,8 @@ typedef struct { DWORD (*FindNextFileW)(object_header_t*,void*); } object_vtbl_t; +#define INTERNET_HANDLE_IN_USE 1 + struct _object_header_t { WH_TYPE htype;
1
0
0
0
Piotr Caban : wininet: Don' t report error in read_gzip_data when to much data was cached.
by Alexandre Julliard
20 Jul '10
20 Jul '10
Module: wine Branch: master Commit: 0736ca71e72429d48b91936331c88844276eed96 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0736ca71e72429d48b9193633…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 20 00:32:59 2010 +0200 wininet: Don't report error in read_gzip_data when to much data was cached. --- dlls/wininet/http.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c9bbde2..a32be25 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2083,6 +2083,9 @@ static DWORD read_gzip_data(http_request_t *req, BYTE *buf, int size, BOOL sync, break; } + if(req->dwContentRead == req->dwContentLength) + break; + buf_avail = req->dwContentLength == ~0 ? req->read_size : min(req->read_size, req->dwContentLength-req->dwContentRead); zstream->next_in = req->read_buf+req->read_pos;
1
0
0
0
Owen Rudge : fusion: Install assemblies into correct directory for architecture.
by Alexandre Julliard
20 Jul '10
20 Jul '10
Module: wine Branch: master Commit: c6d34d7b05aec8dae05c2db7093af43cd085a3c5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c6d34d7b05aec8dae05c2db70…
Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Jul 19 19:33:19 2010 +0100 fusion: Install assemblies into correct directory for architecture. --- dlls/fusion/asmcache.c | 27 ++++++++++++++++++++++----- dlls/fusion/assembly.c | 14 ++++++++++++++ dlls/fusion/fusionpriv.h | 1 + 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index f35de7f..7334e5d 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -91,15 +91,32 @@ static BOOL create_full_path(LPCWSTR path) return ret; } -static BOOL get_assembly_directory(LPWSTR dir, DWORD size) +static BOOL get_assembly_directory(LPWSTR dir, DWORD size, BYTE architecture) { - static const WCHAR gac[] = - {'\\','a','s','s','e','m','b','l','y','\\','G','A','C','_','M','S','I','L',0}; + static const WCHAR gac[] = {'\\','a','s','s','e','m','b','l','y','\\','G','A','C',0}; - FIXME("Ignoring assembly architecture\n"); + static const WCHAR msil[] = {'_','M','S','I','L',0}; + static const WCHAR x86[] = {'_','3','2',0}; + static const WCHAR amd64[] = {'_','6','4',0}; GetWindowsDirectoryW(dir, size); strcatW(dir, gac); + + switch (architecture) + { + case peMSIL: + strcatW(dir, msil); + break; + + case peI386: + strcatW(dir, x86); + break; + + case peAMD64: + strcatW(dir, amd64); + break; + } + return TRUE; } @@ -291,7 +308,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, if (FAILED(hr)) goto done; - get_assembly_directory(asmdir, MAX_PATH); + get_assembly_directory(asmdir, MAX_PATH, assembly_get_architecture(assembly)); sprintfW(path, format, asmdir, name, version, token); diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index bc187ac..328b279 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -811,6 +811,20 @@ HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) return S_OK; } +BYTE assembly_get_architecture(ASSEMBLY *assembly) +{ + if ((assembly->corhdr->MajorRuntimeVersion == 2) && (assembly->corhdr->MinorRuntimeVersion == 0)) + return 0; /* .NET 1.x assembly */ + + if (assembly->nthdr->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + return peAMD64; /* AMD64/IA64 assembly */ + + if ((assembly->corhdr->Flags & COMIMAGE_FLAGS_ILONLY) && !(assembly->corhdr->Flags & COMIMAGE_FLAGS_32BITREQUIRED)) + return peMSIL; /* MSIL assembly */ + + return peI386; /* x86 assembly */ +} + static BYTE *assembly_get_blob(ASSEMBLY *assembly, WORD index, ULONG *size) { return GetData(&assembly->blobs[index], size); diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index 4b9bd57..6f4b28d 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -433,6 +433,7 @@ HRESULT assembly_release(ASSEMBLY *assembly); HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name); HRESULT assembly_get_path(ASSEMBLY *assembly, LPWSTR *path); HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version); +BYTE assembly_get_architecture(ASSEMBLY *assembly); HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token); static inline LPWSTR strdupW(LPCWSTR src)
1
0
0
0
Austin English : rpcrt4/tests: Improve failure messages.
by Alexandre Julliard
20 Jul '10
20 Jul '10
Module: wine Branch: master Commit: eb7c2061143f675fbc26b39c0cec5cb5df33abf0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=eb7c2061143f675fbc26b39c0…
Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 19 12:16:59 2010 -0500 rpcrt4/tests: Improve failure messages. --- dlls/rpcrt4/tests/rpc.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index bb480e1..684b47e 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -283,11 +283,11 @@ todo_wine { &identity, &authzsvc); ok(status == RPC_S_OK, "RpcBindingInqAuthInfo failed (%u)\n", status); - ok(identity == NULL, "expected NULL identity\n"); - ok(principal != (unsigned char *)0xdeadbeef, "expected valid principal\n"); - ok(level == RPC_C_AUTHN_LEVEL_PKT_PRIVACY, "expected RPC_C_AUTHN_LEVEL_PKT_PRIVACY\n"); - ok(authnsvc == RPC_C_AUTHN_WINNT, "expected RPC_C_AUTHN_WINNT\n"); - todo_wine ok(authzsvc == RPC_C_AUTHZ_NAME, "expected RPC_C_AUTHZ_NAME\n"); + ok(identity == NULL, "expected NULL identity, got %p\n", identity); + ok(principal != (unsigned char *)0xdeadbeef, "expected valid principal, got %p\n", principal); + ok(level == RPC_C_AUTHN_LEVEL_PKT_PRIVACY, "expected RPC_C_AUTHN_LEVEL_PKT_PRIVACY, got %d\n", level); + ok(authnsvc == RPC_C_AUTHN_WINNT, "expected RPC_C_AUTHN_WINNT, got %d\n", authnsvc); + todo_wine ok(authzsvc == RPC_C_AUTHZ_NAME, "expected RPC_C_AUTHZ_NAME, got %d\n", authzsvc); RpcStringFree(&principal);
1
0
0
0
André Hentschel : shlwapi/tests: Fix GLE for SHFormatDateTimeA.
by Alexandre Julliard
20 Jul '10
20 Jul '10
Module: wine Branch: master Commit: f42ede788e108226180b9f32bab27107c60e3774 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f42ede788e108226180b9f32b…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 19 19:11:04 2010 +0200 shlwapi/tests: Fix GLE for SHFormatDateTimeA. --- dlls/shlwapi/tests/ordinal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index bf61418..c8cfcfc 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1589,7 +1589,8 @@ if (0) SetLastError(0xdeadbeef); ret = pSHFormatDateTimeA(&filetime, NULL, NULL, 0); ok(ret == 0, "got %d\n", ret); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef || broken(GetLastError() == ERROR_SUCCESS /* Win7 */), + "expected 0xdeadbeef, got %d\n", GetLastError()); SetLastError(0xdeadbeef); buff[0] = 'a'; buff[1] = 0;
1
0
0
0
David Hedberg : shell32: Implement IPersistFolder2 for the desktop folder.
by Alexandre Julliard
20 Jul '10
20 Jul '10
Module: wine Branch: master Commit: fb88e06e79d9f5da72f8985c8a5db096d7aea5d7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fb88e06e79d9f5da72f8985c8…
Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Jul 18 14:34:56 2010 +0200 shell32: Implement IPersistFolder2 for the desktop folder. --- dlls/shell32/shfldr_desktop.c | 60 ++++++++++++++++++++++++++------------- dlls/shell32/tests/shlfolder.c | 46 ++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index e3798a6..e4a612a 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -65,7 +65,7 @@ extern HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisp typedef struct { const IShellFolder2Vtbl *lpVtbl; - const IPersistVtbl *lpVtblIPersist; + const IPersistFolder2Vtbl *lpVtblPF2; LONG ref; /* both paths are parsible from the desktop */ @@ -76,9 +76,9 @@ typedef struct { BOOL fAcceptFmt; /* flag for pending Drop */ } IDesktopFolderImpl; -static inline IDesktopFolderImpl *impl_from_IPersist( IPersist *iface ) +static inline IDesktopFolderImpl *impl_from_IPersistFolder2( IPersistFolder2 *iface ) { - return (IDesktopFolderImpl *)((char*)iface - FIELD_OFFSET(IDesktopFolderImpl, lpVtblIPersist)); + return (IDesktopFolderImpl *)((char*)iface - FIELD_OFFSET(IDesktopFolderImpl, lpVtblPF2)); } static const shvheader desktop_header[] = { @@ -94,7 +94,6 @@ static const shvheader desktop_header[] = { /************************************************************************** * ISF_Desktop_fnQueryInterface * - * NOTES supports not IPersistFolder */ static HRESULT WINAPI ISF_Desktop_fnQueryInterface( IShellFolder2 * iface, REFIID riid, LPVOID * ppvObj) @@ -111,9 +110,11 @@ static HRESULT WINAPI ISF_Desktop_fnQueryInterface( { *ppvObj = This; } - else if (IsEqualIID (riid, &IID_IPersist)) + else if (IsEqualIID (riid, &IID_IPersist) || + IsEqualIID (riid, &IID_IPersistFolder) || + IsEqualIID (riid, &IID_IPersistFolder2)) { - *ppvObj = &This->lpVtblIPersist; + *ppvObj = &This->lpVtblPF2; } if (*ppvObj) @@ -877,37 +878,56 @@ static const IShellFolder2Vtbl vt_MCFldr_ShellFolder2 = /************************************************************************** * IPersist */ -static HRESULT WINAPI ISF_Desktop_IPersist_fnQueryInterface( - IPersist *iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI ISF_Desktop_IPersistFolder2_fnQueryInterface( + IPersistFolder2 *iface, REFIID riid, LPVOID *ppvObj) { - IDesktopFolderImpl *This = impl_from_IPersist( iface ); + IDesktopFolderImpl *This = impl_from_IPersistFolder2( iface ); return IShellFolder2_QueryInterface((IShellFolder2*)This, riid, ppvObj); } -static ULONG WINAPI ISF_Desktop_IPersist_fnAddRef(IPersist *iface) +static ULONG WINAPI ISF_Desktop_IPersistFolder2_fnAddRef( + IPersistFolder2 *iface) { - IDesktopFolderImpl *This = impl_from_IPersist( iface ); + IDesktopFolderImpl *This = impl_from_IPersistFolder2( iface ); return IShellFolder2_AddRef((IShellFolder2*)This); } -static ULONG WINAPI ISF_Desktop_IPersist_fnRelease(IPersist *iface) +static ULONG WINAPI ISF_Desktop_IPersistFolder2_fnRelease( + IPersistFolder2 *iface) { - IDesktopFolderImpl *This = impl_from_IPersist( iface ); + IDesktopFolderImpl *This = impl_from_IPersistFolder2( iface ); return IShellFolder2_Release((IShellFolder2*)This); } -static HRESULT WINAPI ISF_Desktop_IPersist_fnGetClassID(IPersist *iface, CLSID *clsid) +static HRESULT WINAPI ISF_Desktop_IPersistFolder2_fnGetClassID( + IPersistFolder2 *iface, CLSID *clsid) { *clsid = CLSID_ShellDesktop; return S_OK; } +static HRESULT WINAPI ISF_Desktop_IPersistFolder2_fnInitialize( + IPersistFolder2 *iface, LPCITEMIDLIST pidl) +{ + IDesktopFolderImpl *This = impl_from_IPersistFolder2( iface ); + FIXME ("(%p)->(%p) stub\n", This, pidl); + return E_NOTIMPL; +} +static HRESULT WINAPI ISF_Desktop_IPersistFolder2_fnGetCurFolder( + IPersistFolder2 *iface, LPITEMIDLIST *ppidl) +{ + IDesktopFolderImpl *This = impl_from_IPersistFolder2( iface ); + *ppidl = ILClone(This->pidlRoot); + return S_OK; +} -static const IPersistVtbl vt_IPersist = +static const IPersistFolder2Vtbl vt_IPersistFolder2 = { - ISF_Desktop_IPersist_fnQueryInterface, - ISF_Desktop_IPersist_fnAddRef, - ISF_Desktop_IPersist_fnRelease, - ISF_Desktop_IPersist_fnGetClassID + ISF_Desktop_IPersistFolder2_fnQueryInterface, + ISF_Desktop_IPersistFolder2_fnAddRef, + ISF_Desktop_IPersistFolder2_fnRelease, + ISF_Desktop_IPersistFolder2_fnGetClassID, + ISF_Desktop_IPersistFolder2_fnInitialize, + ISF_Desktop_IPersistFolder2_fnGetCurFolder }; /************************************************************************** @@ -939,7 +959,7 @@ HRESULT WINAPI ISF_Desktop_Constructor ( sf->ref = 1; sf->lpVtbl = &vt_MCFldr_ShellFolder2; - sf->lpVtblIPersist = &vt_IPersist; + sf->lpVtblPF2 = &vt_IPersistFolder2; sf->pidlRoot = _ILCreateDesktop(); /* my qualified pidl */ sf->sPathTarget = SHAlloc( (lstrlenW(szMyPath) + 1)*sizeof(WCHAR) ); lstrcpyW( sf->sPathTarget, szMyPath ); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 2909818..210631d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2014,6 +2014,26 @@ static void test_SHCreateShellItem(void) IShellItem_Release(shellitem); } + ret = pSHCreateShellItem(NULL, desktopfolder, pidl_testfile, &shellitem); + ok(SUCCEEDED(ret), "SHCreateShellItem returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ret = IShellItem_QueryInterface(shellitem, &IID_IPersistIDList, (void**)&persistidl); + ok(SUCCEEDED(ret), "QueryInterface returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ret = IPersistIDList_GetIDList(persistidl, &pidl_test); + ok(SUCCEEDED(ret), "GetIDList returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ok(ILIsEqual(pidl_testfile, pidl_test), "id lists are not equal\n"); + pILFree(pidl_test); + } + IPersistIDList_Release(persistidl); + } + IShellItem_Release(shellitem); + } + DeleteFileA(".\\testfile"); pILFree(pidl_abstestfile); pILFree(pidl_testfile); @@ -2084,6 +2104,7 @@ static void test_desktop_IPersist(void) { IShellFolder *desktop; IPersist *persist; + IPersistFolder2 *ppf2; CLSID clsid; HRESULT hr; @@ -2107,6 +2128,31 @@ static void test_desktop_IPersist(void) IPersist_Release(persist); } + hr = IShellFolder_QueryInterface(desktop, &IID_IPersistFolder2, (void**)&ppf2); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* pre-Vista */, "failed %08x\n", hr); + if(SUCCEEDED(hr)) + { + IPersistFolder *ppf; + LPITEMIDLIST pidl; + hr = IShellFolder_QueryInterface(desktop, &IID_IPersistFolder, (void**)&ppf); + ok(hr == S_OK, "IID_IPersistFolder2 without IID_IPersistFolder.\n"); + if(SUCCEEDED(hr)) + IPersistFolder_Release(ppf); + + todo_wine { + hr = IPersistFolder2_Initialize(ppf2, NULL); + ok(hr == S_OK, "got %08x\n", hr); + } + + pidl = NULL; + hr = IPersistFolder2_GetCurFolder(ppf2, &pidl); + ok(hr == S_OK, "got %08x\n", hr); + ok(pidl != NULL, "pidl was NULL.\n"); + if(SUCCEEDED(hr)) pILFree(pidl); + + IPersistFolder2_Release(ppf2); + } + IShellFolder_Release(desktop); }
1
0
0
0
David Hedberg : shell32/tests: Try harder to subclass the listview.
by Alexandre Julliard
20 Jul '10
20 Jul '10
Module: wine Branch: master Commit: 1d658d4bb78d2476c467da420088a9ffc74767f9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1d658d4bb78d2476c467da420…
Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Jul 18 14:51:48 2010 +0200 shell32/tests: Try harder to subclass the listview. --- dlls/shell32/tests/shlview.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index e3e0ef2..e86518d 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -78,6 +78,16 @@ static HWND subclass_listview(HWND hwnd) /* listview is a first child */ listview = FindWindowExA(hwnd, NULL, WC_LISTVIEWA, NULL); + if(!listview) + { + /* .. except for some versions of Windows XP, where things + are slightly more complicated. */ + HWND hwnd_tmp; + hwnd_tmp = FindWindowExA(hwnd, NULL, "DUIViewWndClassName", NULL); + hwnd_tmp = FindWindowExA(hwnd_tmp, NULL, "DirectUIHWND", NULL); + hwnd_tmp = FindWindowExA(hwnd_tmp, NULL, "CtrlNotifySink", NULL); + listview = FindWindowExA(hwnd_tmp, NULL, WC_LISTVIEWA, NULL); + } oldproc = (WNDPROC)SetWindowLongPtrA(listview, GWLP_WNDPROC, (LONG_PTR)listview_subclass_proc);
1
0
0
0
Mike Kaplinskiy : server: Forward the correct error to asyncs.
by Alexandre Julliard
20 Jul '10
20 Jul '10
Module: wine Branch: master Commit: 8d9fbe59b303e8da9062f9de12a20f5dafc07a71 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8d9fbe59b303e8da9062f9de1…
Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Jul 17 22:06:58 2010 -0400 server: Forward the correct error to asyncs. --- server/sock.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/server/sock.c b/server/sock.c index 568f818..e5681b0 100644 --- a/server/sock.c +++ b/server/sock.c @@ -295,7 +295,7 @@ static inline int sock_error( struct fd *fd ) return optval; } -static void sock_dispatch_asyncs( struct sock *sock, int event ) +static void sock_dispatch_asyncs( struct sock *sock, int event, int error ) { if ( sock->flags & WSA_FLAG_OVERLAPPED ) { @@ -311,10 +311,12 @@ static void sock_dispatch_asyncs( struct sock *sock, int event ) } if ( event & (POLLERR|POLLHUP) ) { + int status = sock_get_ntstatus( error ); + if ( !(sock->state & FD_READ) ) - async_wake_up( sock->read_q, STATUS_SUCCESS ); + async_wake_up( sock->read_q, status ); if ( !(sock->state & FD_WRITE) ) - async_wake_up( sock->write_q, STATUS_SUCCESS ); + async_wake_up( sock->write_q, status ); } } } @@ -449,7 +451,7 @@ static void sock_poll_event( struct fd *fd, int event ) event |= POLLHUP; } - sock_dispatch_asyncs( sock, event ); + sock_dispatch_asyncs( sock, event, error ); sock_dispatch_events( sock, prevstate, event, error ); /* if anyone is stupid enough to wait on the socket object itself,
1
0
0
0
Mike Kaplinskiy : server: In case of hangup/error, wake up all asyncs that can no longer be completed.
by Alexandre Julliard
20 Jul '10
20 Jul '10
Module: wine Branch: master Commit: be230adbb7400d84fcc5312a0463eee7480709e9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=be230adbb7400d84fcc5312a0…
Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Jul 17 22:06:55 2010 -0400 server: In case of hangup/error, wake up all asyncs that can no longer be completed. --- server/sock.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 87628da..568f818 100644 --- a/server/sock.c +++ b/server/sock.c @@ -299,16 +299,23 @@ static void sock_dispatch_asyncs( struct sock *sock, int event ) { if ( sock->flags & WSA_FLAG_OVERLAPPED ) { - if ( event & (POLLIN|POLLPRI|POLLERR|POLLHUP) && async_waiting( sock->read_q )) + if ( event & (POLLIN|POLLPRI) && async_waiting( sock->read_q ) ) { if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock ); async_wake_up( sock->read_q, STATUS_ALERTED ); } - if ( event & (POLLOUT|POLLERR|POLLHUP) && async_waiting( sock->write_q )) + if ( event & POLLOUT && async_waiting( sock->write_q ) ) { if (debug_level) fprintf( stderr, "activating write queue for socket %p\n", sock ); async_wake_up( sock->write_q, STATUS_ALERTED ); } + if ( event & (POLLERR|POLLHUP) ) + { + if ( !(sock->state & FD_READ) ) + async_wake_up( sock->read_q, STATUS_SUCCESS ); + if ( !(sock->state & FD_WRITE) ) + async_wake_up( sock->write_q, STATUS_SUCCESS ); + } } }
1
0
0
0
← Newer
1
...
51
52
53
54
55
56
57
...
90
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
Results per page:
10
25
50
100
200