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

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

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

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

Alexandre Julliard : comctl32: Fix positioning of toolbars that have the WS_BORDER style.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: af6fb4712fd841f17583f1fb32a50089d70f9820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6fb4712fd841f17583f1fb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 20 14:29:24 2010 +0200 comctl32: Fix positioning of toolbars that have the WS_BORDER style. --- dlls/comctl32/toolbar.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index fe782c3..9b41732 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3028,7 +3028,7 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (!(infoPtr->dwStyle & CCS_NORESIZE)) { RECT window_rect; - UINT uPosFlags = SWP_NOZORDER; + UINT uPosFlags = SWP_NOZORDER | SWP_NOACTIVATE; if ((infoPtr->dwStyle & CCS_BOTTOM) == CCS_NOMOVEY) { @@ -3050,9 +3050,8 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (infoPtr->dwStyle & WS_BORDER) { - x = y = 1; /* FIXME: this looks wrong */ - cy += GetSystemMetrics(SM_CYEDGE); - cx += GetSystemMetrics(SM_CXEDGE); + cy += 2 * GetSystemMetrics(SM_CXBORDER); + cx += 2 * GetSystemMetrics(SM_CYBORDER); } SetWindowPos(infoPtr->hwndSelf, NULL, x, y, cx, cy, uPosFlags); @@ -4842,7 +4841,7 @@ TOOLBAR_SetRows (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPRECT lprc) SetWindowPos(infoPtr->hwndSelf, NULL, 0, 0, infoPtr->rcBound.right - infoPtr->rcBound.left, infoPtr->rcBound.bottom - infoPtr->rcBound.top, - SWP_NOMOVE); + SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); } /* repaint toolbar */ @@ -6007,7 +6006,7 @@ TOOLBAR_NCPaint (HWND hwnd, WPARAM wParam, LPARAM lParam) GetWindowRect (hwnd, &rcWindow); OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top); if( dwStyle & WS_BORDER ) - OffsetRect (&rcWindow, 1, 1); + InflateRect (&rcWindow, -1, -1); DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_TOP); }

1 0

Paul Vriens : msi: Add the Serbian (Cyrillic) translation.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: f2135efe4823dd5a035526fcc5e400b6046d04a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2135efe4823dd5a035526fcc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 20 11:11:54 2010 +0200 msi: Add the Serbian (Cyrillic) translation. Translation by Nenad Vujic <nesa24casa(a)gmail.com> --- dlls/msi/msi_Sr.rc | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi_Sr.rc b/dlls/msi/msi_Sr.rc index 854b811..552aec8 100644 --- a/dlls/msi/msi_Sr.rc +++ b/dlls/msi/msi_Sr.rc @@ -63,3 +63,44 @@ STRINGTABLE DISCARDABLE 14 "dodatak sa:" 15 "izaberite koji folder sadrži %s" } + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE DISCARDABLE +{ + 4 "Инсталација не може бити отворена. Молимо проверите дестинацију фајла и покушајте поново." + 5 "путања %s није нађена" + 9 "Убаците диск %s" + 10 "Виндовс Инсталација програма %s\n\n" \ + "Сврха:\n" \ + "msiexec команда {тражени параметар} [опциони параметар]\n\n" \ + "Инсталација производа:\n" \ + "\t/i {пакет|код} [својина]\n" \ + "\t/package {пакет|код} [својина]\n" \ + "\t/a пакет [svojina]\n" \ + "Поправак инсталације:\n" \ + "\t/f[p|o|e|d|c|a|u|m|s|v] {пакет|код}\n" \ + "Брисање програма:\n" \ + "\t/uninstall {пакет|код} [svojina]\n" \ + "\t/x {пакет|код} [својина]\n" \ + "Реклама програма:\n" \ + "\t/j[u|m] пакет [/t transform] [/g languageid]\n" \ + "Примени печ:\n" \ + "\t/p печпакет [својина]\n" \ + "\t/p печпакет /a пакет [својина]\n" \ + "Известај и Изглед Модификатора за команде изнад:\n" \ + "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] извештај\n" \ + "\t/q{|n|b|r|f|n+|b+|b-}\n" \ + "Регистрација МСИ Сервиса:\n" \ + "\t/y\n" \ + "Уклањање МСИ Сервиса:\n" \ + "\t/z\n" \ + "Прикажи ову Помоћ:\n" \ + "\t/help\n" \ + "\t/?\n" + 11 "Унесите који фолдер садржи %s" + 12 "Инсталација недостаје" + 13 "Мрежни драјв недостаје" + 14 "Додатак са:" + 15 "Изаберите који фолдер садржи %s" +}

1 0

Andrew Nguyen : shlwapi/tests: Rename a string variable for clarity.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: f8c88bc3d7a59a69da80277a3750622e9148de76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c88bc3d7a59a69da80277a3… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jul 19 23:13:57 2010 -0500 shlwapi/tests: Rename a string variable for clarity. --- dlls/shlwapi/tests/string.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 3d6d4a2..e0d4910 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -964,7 +964,7 @@ if (0) static void test_StrStrA(void) { - static const char *deadbeef = "DeAdBeEf"; + static const char *deadbeefA = "DeAdBeEf"; const struct { @@ -973,11 +973,11 @@ static void test_StrStrA(void) } StrStrA_cases[] = { {"", NULL}, - {"DeAd", deadbeef}, + {"DeAd", deadbeefA}, {"dead", NULL}, - {"AdBe", deadbeef + 2}, + {"AdBe", deadbeefA + 2}, {"adbe", NULL}, - {"BeEf", deadbeef + 4}, + {"BeEf", deadbeefA + 4}, {"beef", NULL}, }; @@ -1002,7 +1002,7 @@ static void test_StrStrA(void) for (i = 0; i < sizeof(StrStrA_cases)/sizeof(StrStrA_cases[0]); i++) { - ret = StrStrA(deadbeef, StrStrA_cases[i].search); + ret = StrStrA(deadbeefA, StrStrA_cases[i].search); ok(ret == StrStrA_cases[i].expect, "[%d] Expected StrStrA to return %p, got %p\n", i, StrStrA_cases[i].expect, ret); @@ -1065,7 +1065,7 @@ static void test_StrStrW(void) static void test_StrStrIA(void) { - static const char *deadbeef = "DeAdBeEf"; + static const char *deadbeefA = "DeAdBeEf"; const struct { @@ -1074,12 +1074,12 @@ static void test_StrStrIA(void) } StrStrIA_cases[] = { {"", NULL}, - {"DeAd", deadbeef}, - {"dead", deadbeef}, - {"AdBe", deadbeef + 2}, - {"adbe", deadbeef + 2}, - {"BeEf", deadbeef + 4}, - {"beef", deadbeef + 4}, + {"DeAd", deadbeefA}, + {"dead", deadbeefA}, + {"AdBe", deadbeefA + 2}, + {"adbe", deadbeefA + 2}, + {"BeEf", deadbeefA + 4}, + {"beef", deadbeefA + 4}, {"cafe", NULL}, }; @@ -1104,7 +1104,7 @@ static void test_StrStrIA(void) for (i = 0; i < sizeof(StrStrIA_cases)/sizeof(StrStrIA_cases[0]); i++) { - ret = StrStrIA(deadbeef, StrStrIA_cases[i].search); + ret = StrStrIA(deadbeefA, StrStrIA_cases[i].search); ok(ret == StrStrIA_cases[i].expect, "[%d] Expected StrStrIA to return %p, got %p\n", i, StrStrIA_cases[i].expect, ret);

1 0

Andrey Turkin : oleaut32: Add support for const variables.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: fe7e384e07020a5e6c51b5ba1f928da857928a35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7e384e07020a5e6c51b5ba1… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Jul 17 11:40:10 2010 +0400 oleaut32: Add support for const variables. --- dlls/oleaut32/typelib2.c | 71 ++++++++++++++++++++++++++-------------------- 1 files changed, 40 insertions(+), 31 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index df060c0..10e26fb 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2026,6 +2026,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( { ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; + HRESULT status = S_OK; CyclicList *insert; INT *typedata; int var_datawidth; @@ -2079,7 +2080,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( /* fill out the basic type information */ typedata[0] = 0x14 | (index << 16); typedata[2] = pVarDesc->wVarFlags; - typedata[3] = (sizeof(VARDESC) << 16) | 0; + typedata[3] = (sizeof(VARDESC) << 16) | pVarDesc->varkind; /* update the index data */ insert->indice = 0x40000000 + index; @@ -2091,44 +2092,52 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( &typedata[1], &var_datawidth, &var_alignment, &var_type_size); - /* pad out starting position to data width */ - This->datawidth += var_alignment - 1; - This->datawidth &= ~(var_alignment - 1); - typedata[4] = This->datawidth; - - /* add the new variable to the total data width */ - This->datawidth += var_datawidth; - if(This->dual) - This->dual->datawidth = This->datawidth; + if (pVarDesc->varkind != VAR_CONST) + { + /* pad out starting position to data width */ + This->datawidth += var_alignment - 1; + This->datawidth &= ~(var_alignment - 1); + typedata[4] = This->datawidth; + + /* add the new variable to the total data width */ + This->datawidth += var_datawidth; + if(This->dual) + This->dual->datawidth = This->datawidth; + + /* add type description size to total required allocation */ + typedata[3] += var_type_size << 16; + + /* fix type alignment */ + alignment = (This->typeinfo->typekind >> 11) & 0x1f; + if (alignment < var_alignment) { + alignment = var_alignment; + This->typeinfo->typekind &= ~0xf800; + This->typeinfo->typekind |= alignment << 11; + } - /* add type description size to total required allocation */ - typedata[3] += var_type_size << 16; + /* ??? */ + if (!This->typeinfo->res2) This->typeinfo->res2 = 0x1a; + if ((index == 0) || (index == 1) || (index == 2) || (index == 4) || (index == 9)) { + This->typeinfo->res2 <<= 1; + } - /* fix type alignment */ - alignment = (This->typeinfo->typekind >> 11) & 0x1f; - if (alignment < var_alignment) { - alignment = var_alignment; - This->typeinfo->typekind &= ~0xf800; - This->typeinfo->typekind |= alignment << 11; - } + /* ??? */ + if (This->typeinfo->res3 == -1) This->typeinfo->res3 = 0; + This->typeinfo->res3 += 0x2c; - /* ??? */ - if (!This->typeinfo->res2) This->typeinfo->res2 = 0x1a; - if ((index == 0) || (index == 1) || (index == 2) || (index == 4) || (index == 9)) { - This->typeinfo->res2 <<= 1; + /* pad data width to alignment */ + This->typeinfo->size = (This->datawidth + (alignment - 1)) & ~(alignment - 1); + } else { + VARIANT *value = pVarDesc->DUMMYUNIONNAME.lpvarValue; + status = ctl2_encode_variant(This->typelib, typedata+4, value, V_VT(value)); + /* ??? native sets size 0x34 */ + typedata[3] += 0x10 << 16; } - /* ??? */ - if (This->typeinfo->res3 == -1) This->typeinfo->res3 = 0; - This->typeinfo->res3 += 0x2c; - /* increment the number of variable elements */ This->typeinfo->cElement += 0x10000; - /* pad data width to alignment */ - This->typeinfo->size = (This->datawidth + (alignment - 1)) & ~(alignment - 1); - - return S_OK; + return status; } /******************************************************************************

1 0

Andrey Turkin : oleaut32: Better handle secondary type when generating type descriptors.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: 9fd7f392dc9bf9765d11e80957a4befe60891172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd7f392dc9bf9765d11e8095… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Jul 17 11:40:23 2010 +0400 oleaut32: Better handle secondary type when generating type descriptors. --- dlls/oleaut32/typelib2.c | 84 +++++++++++++++++++++++---------------------- 1 files changed, 43 insertions(+), 41 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 10e26fb..1096ea8 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1080,65 +1080,49 @@ static int ctl2_encode_typedesc( break; case VT_PTR: - /* FIXME: Make with the error checking. */ - FIXME("PTR vartype, may not work correctly.\n"); - - ctl2_encode_typedesc(This, tdesc->u.lptdesc, &target_type, NULL, NULL, &child_size); - - for (typeoffset = 0; typeoffset < This->typelib_segdir[MSFT_SEG_TYPEDESC].length; typeoffset += 8) { - typedata = (void *)&This->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; - if (((typedata[0] & 0xffff) == VT_PTR) && (typedata[1] == target_type)) break; - } - - if (typeoffset == This->typelib_segdir[MSFT_SEG_TYPEDESC].length) { - int mix_field; - - if (target_type & 0x80000000) { - mix_field = ((target_type >> 16) & 0x3fff) | VT_BYREF; - } else { - typedata = (void *)&This->typelib_segment_data[MSFT_SEG_TYPEDESC][target_type]; - mix_field = ((typedata[0] >> 16) == 0x7fff)? 0x7fff: 0x7ffe; - } - - typeoffset = ctl2_alloc_segment(This, MSFT_SEG_TYPEDESC, 8, 0); - typedata = (void *)&This->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; - - typedata[0] = (mix_field << 16) | VT_PTR; - typedata[1] = target_type; - } - - *encoded_tdesc = typeoffset; - - *width = 4; - *alignment = 4; - *decoded_size = sizeof(TYPEDESC) + child_size; - break; - case VT_SAFEARRAY: /* FIXME: Make with the error checking. */ - FIXME("SAFEARRAY vartype, may not work correctly.\n"); + FIXME("PTR or SAFEARRAY vartype, may not work correctly.\n"); ctl2_encode_typedesc(This, tdesc->u.lptdesc, &target_type, NULL, NULL, &child_size); for (typeoffset = 0; typeoffset < This->typelib_segdir[MSFT_SEG_TYPEDESC].length; typeoffset += 8) { typedata = (void *)&This->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; - if (((typedata[0] & 0xffff) == VT_SAFEARRAY) && (typedata[1] == target_type)) break; + if (((typedata[0] & 0xffff) == tdesc->vt) && (typedata[1] == target_type)) break; } if (typeoffset == This->typelib_segdir[MSFT_SEG_TYPEDESC].length) { int mix_field; if (target_type & 0x80000000) { - mix_field = ((target_type >> 16) & VT_TYPEMASK) | VT_ARRAY; + mix_field = (target_type >> 16) & VT_TYPEMASK; } else { typedata = (void *)&This->typelib_segment_data[MSFT_SEG_TYPEDESC][target_type]; - mix_field = ((typedata[0] >> 16) == 0x7fff)? 0x7fff: 0x7ffe; + switch((typedata[0]>>16) & ~VT_ARRAY) + { + case VT_UI1: + case VT_I1: + case VT_UI2: + case VT_I2: + case VT_I4: + case VT_UI4: + mix_field = typedata[0]>>16; + break; + default: + mix_field = 0x7fff; + break; + } } + if (tdesc->vt == VT_PTR) + mix_field |= VT_BYREF; + else if (tdesc->vt == VT_SAFEARRAY) + mix_field |= VT_ARRAY; + typeoffset = ctl2_alloc_segment(This, MSFT_SEG_TYPEDESC, 8, 0); typedata = (void *)&This->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; - typedata[0] = (mix_field << 16) | VT_SAFEARRAY; + typedata[0] = (mix_field << 16) | tdesc->vt; typedata[1] = target_type; } @@ -1182,17 +1166,34 @@ static int ctl2_encode_typedesc( break; } case VT_USERDEFINED: + { + const MSFT_TypeInfoBase *basetype; + INT basevt = 0x7fff; + TRACE("USERDEFINED.\n"); + if (tdesc->u.hreftype % sizeof(*basetype) == 0 && tdesc->u.hreftype < This->typelib_segdir[MSFT_SEG_TYPEINFO].length) + { + basetype = (MSFT_TypeInfoBase*)&(This->typelib_segment_data[MSFT_SEG_TYPEINFO][tdesc->u.hreftype]); + switch(basetype->typekind & 0xf) + { + case TKIND_ENUM: + basevt = VT_I4; + break; + default: + FIXME("USERDEFINED basetype %d not handled\n", basetype->typekind & 0xf); + break; + } + } for (typeoffset = 0; typeoffset < This->typelib_segdir[MSFT_SEG_TYPEDESC].length; typeoffset += 8) { typedata = (void *)&This->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; - if ((typedata[0] == ((0x7fff << 16) | VT_USERDEFINED)) && (typedata[1] == tdesc->u.hreftype)) break; + if ((typedata[0] == ((basevt << 16) | VT_USERDEFINED)) && (typedata[1] == tdesc->u.hreftype)) break; } if (typeoffset == This->typelib_segdir[MSFT_SEG_TYPEDESC].length) { typeoffset = ctl2_alloc_segment(This, MSFT_SEG_TYPEDESC, 8, 0); typedata = (void *)&This->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; - typedata[0] = (0x7fff << 16) | VT_USERDEFINED; + typedata[0] = (basevt << 16) | VT_USERDEFINED; typedata[1] = tdesc->u.hreftype; } @@ -1200,6 +1201,7 @@ static int ctl2_encode_typedesc( *width = 0; *alignment = 1; break; + } default: FIXME("Unrecognized type %d.\n", tdesc->vt);

1 0

David Hedberg : include: Add IEnumShellItems interface declaration.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: 95a46b017c26e975b0f0b0160b647b6325b90775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a46b017c26e975b0f0b0160… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 17 17:21:59 2010 +0200 include: Add IEnumShellItems interface declaration. --- dlls/actxprxy/usrmarshal.c | 27 +++++++++++++++++++++++++++ include/shobjidl.idl | 29 +++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/actxprxy/usrmarshal.c b/dlls/actxprxy/usrmarshal.c index f2aacf8..b9f4f2d 100644 --- a/dlls/actxprxy/usrmarshal.c +++ b/dlls/actxprxy/usrmarshal.c @@ -34,6 +34,7 @@ #include "servprov.h" #include "comcat.h" #include "docobj.h" +#include "shobjidl.h" #include "wine/debug.h" @@ -168,3 +169,29 @@ HRESULT __RPC_STUB IEnumOleDocumentViews_Next_Stub( TRACE("(%p)\n", This); return IEnumOleDocumentViews_Next( This, cViews, rgpView, pcFetched ); } + +HRESULT CALLBACK IEnumShellItems_Next_Proxy( + IEnumShellItems *This, + ULONG celt, + IShellItem **rgelt, + ULONG *pceltFetched) +{ + ULONG fetched; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + if (!pceltFetched) pceltFetched = &fetched; + return IEnumShellItems_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); +} + +HRESULT __RPC_STUB IEnumShellItems_Next_Stub( + IEnumShellItems *This, + ULONG celt, + IShellItem **rgelt, + ULONG *pceltFetched) +{ + HRESULT hr; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + *pceltFetched = 0; + hr = IEnumShellItems_Next(This, celt, rgelt, pceltFetched); + if (hr == S_OK) *pceltFetched = celt; + return hr; +} diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 5ad5bf4..36618a3 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -414,6 +414,35 @@ interface INewWindowManager : IUnknown cpp_quote("#define SID_SNewWindowManager IID_INewWindowManager") /***************************************************************************** + * IEnumShellItems interface + */ +[ + object, + uuid(70629033-E363-4A28-A567-0DB78006E6D7), + pointer_default(unique) +] +interface IEnumShellItems : IUnknown +{ + [local] HRESULT Next( + [in] ULONG celt, + [out, size_is(celt), length_is(*pceltFetched)] IShellItem **rgelt, + [out] ULONG *pceltFetched); + + [call_as(Next)] HRESULT RemoteNext( + [in] ULONG celt, + [out, size_is(celt), length_is(*pceltFetched)] IShellItem **rgelt, + [out] ULONG *pceltFetched); + + HRESULT Skip( + [in] ULONG celt); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumShellItems **ppenum); +} + +/***************************************************************************** * FOLDERSETTINGS */ typedef char *LPVIEWSETTINGS;

1 0

David Hedberg : include: Add IShellItemArray and IShellItemFilter interface declarations.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: d5a7ad89aa28fba30165fc3e1ae504c03d5c10ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a7ad89aa28fba30165fc3e1… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 17 17:22:00 2010 +0200 include: Add IShellItemArray and IShellItemFilter interface declarations. --- dlls/mmdevapi/main.c | 2 + include/shobjidl.idl | 72 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 18d8f80..c8fcea0 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -38,7 +38,9 @@ #include "ole2.h" #include "olectl.h" +#include "propsys.h" #include "initguid.h" +#include "propkeydef.h" #include "mmdeviceapi.h" #include "dshow.h" #include "dsound.h" diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 36618a3..87ae657 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -30,7 +30,7 @@ import "propidl.idl"; /* FIXME: import "prsht.idl";*/ import "msxml.idl"; import "wtypes.idl"; -/* FIXME: import "propsys.idl"; */ +import "propsys.idl"; /* FIXME: import "structuredquery.idl"; */ cpp_quote("/* FIXME: #include <sherrors.h> */") @@ -443,6 +443,76 @@ interface IEnumShellItems : IUnknown } /***************************************************************************** + * IShellItemArray interface + */ +[ + object, + uuid(B63EA76D-1F85-456F-A19C-48159EFA858B), + pointer_default(unique) +] +interface IShellItemArray : IUnknown +{ + typedef [v1_enum] enum SIATTRIBFLAGS { + SIATTRIBFLAGS_AND = 0x0001, + SIATTRIBFLAGS_OR = 0x0002, + SIATTRIBFLAGS_APPCOMPAT = 0x0003, + SIATTRIBFLAGS_MASK = 0x0003, + SIATTRIBFLAGS_ALLITEMS = 0x4000 + } SIATTRIBFLAGS; + cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(SIATTRIBFLAGS)") + + HRESULT BindToHandler( + [in, unique] IBindCtx *pbc, + [in] REFGUID bhid, + [in] REFIID riid, + [out, iid_is(riid)] void **ppvOut); + + HRESULT GetPropertyStore( + [in] GETPROPERTYSTOREFLAGS flags, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT GetPropertyDescriptionList( + [in] REFPROPERTYKEY keyType, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT GetAttributes( + [in] SIATTRIBFLAGS AttribFlags, + [in] SFGAOF sfgaoMask, + [out] SFGAOF *psfgaoAttribs); + + HRESULT GetCount( + [out] DWORD *pdwNumItems); + + HRESULT GetItemAt( + [in] DWORD dwIndex, + [out] IShellItem **ppsi); + + HRESULT EnumItems( + [out] IEnumShellItems **ppenumShellItems); + +} + +/***************************************************************************** + * IShellItemFilter interface + */ +[ + object, + uuid(2659B475-EEB8-48B7-8F07-B378810F48CF), + pointer_default(unique) +] +interface IShellItemFilter : IUnknown +{ + HRESULT IncludeItem( + [in] IShellItem *psi); + + HRESULT GetEnumFlagsForItem( + [in] IShellItem *psi, + [out] SHCONTF *pgrfFlags); +} + +/***************************************************************************** * FOLDERSETTINGS */ typedef char *LPVIEWSETTINGS;

1 0