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

André Hentschel : shlwapi/tests: Fix GLE for SHFormatDateTimeA.
by Alexandre Julliard July 20, 2010

July 20, 2010

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

Piotr Caban : wininet: Allow HTTPREQ_ReadFileEx read more then one data chunk.
by Alexandre Julliard July 20, 2010

July 20, 2010

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 : comctl32: Fix positioning of toolbars that have the WS_BORDER style.
by Alexandre Julliard July 20, 2010

July 20, 2010

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

Andrew Nguyen : shlwapi/tests: Rename a string variable for clarity.
by Alexandre Julliard July 20, 2010

July 20, 2010

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

Alexandre Julliard : gdi32: Reject invalid DIB depths in CreateDIBSection.
by Alexandre Julliard July 20, 2010

July 20, 2010

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

Paul Vriens : msi: Add the Serbian (Cyrillic) translation.
by Alexandre Julliard July 20, 2010

July 20, 2010

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

David Hedberg : shell32: Implement IPersistFolder2 for the desktop folder.
by Alexandre Julliard July 20, 2010

July 20, 2010

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

Mike Kaplinskiy : server: Move signaling FD_* events to a separate function .
by Alexandre Julliard July 20, 2010

July 20, 2010

Module: wine Branch: master Commit: 75c7c63886d61574566a878e8458dc453260448a URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c7c63886d61574566a878e8… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Jul 17 22:06:49 2010 -0400 server: Move signaling FD_* events to a separate function. --- server/sock.c | 112 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 56 insertions(+), 56 deletions(-) diff --git a/server/sock.c b/server/sock.c index 9cd0fc2..5d48c2d 100644 --- a/server/sock.c +++ b/server/sock.c @@ -312,10 +312,60 @@ static void sock_dispatch_asyncs( struct sock *sock, int event ) } } +static void sock_dispatch_events( struct sock *sock, int prevstate, int event, int error ) +{ + if (prevstate & FD_CONNECT) + { + sock->pmask |= FD_CONNECT; + sock->hmask |= FD_CONNECT; + sock->errors[FD_CONNECT_BIT] = error; + goto end; + } + if (prevstate & FD_WINE_LISTENING) + { + sock->pmask |= FD_ACCEPT; + sock->hmask |= FD_ACCEPT; + sock->errors[FD_ACCEPT_BIT] = error; + goto end; + } + + if (event & POLLIN) + { + sock->pmask |= FD_READ; + sock->hmask |= FD_READ; + sock->errors[FD_READ_BIT] = 0; + } + + if (event & POLLOUT) + { + sock->pmask |= FD_WRITE; + sock->hmask |= FD_WRITE; + sock->errors[FD_WRITE_BIT] = 0; + } + + if (event & POLLPRI) + { + sock->pmask |= FD_OOB; + sock->hmask |= FD_OOB; + sock->errors[FD_OOB_BIT] = 0; + } + + if (event & (POLLERR|POLLHUP)) + { + sock->pmask |= FD_CLOSE; + sock->hmask |= FD_CLOSE; + sock->errors[FD_CLOSE_BIT] = error; + } +end: + sock_wake_up( sock ); +} + static void sock_poll_event( struct fd *fd, int event ) { struct sock *sock = get_fd_user( fd ); int hangup_seen = 0; + int prevstate = sock->state; + int error = 0; assert( sock->obj.ops == &sock_ops ); if (debug_level) @@ -332,38 +382,19 @@ static void sock_poll_event( struct fd *fd, int event ) /* we got connected */ sock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE; sock->state &= ~FD_CONNECT; - sock->pmask |= FD_CONNECT; - sock->errors[FD_CONNECT_BIT] = 0; - if (debug_level) - fprintf(stderr, "socket %p connection success\n", sock); } else if (event & (POLLERR|POLLHUP)) { /* we didn't get connected? */ sock->state &= ~FD_CONNECT; - sock->pmask |= FD_CONNECT; - sock->errors[FD_CONNECT_BIT] = sock_error( fd ); - if (debug_level) - fprintf(stderr, "socket %p connection failure\n", sock); + error = sock_error( fd ); } } else if (sock->state & FD_WINE_LISTENING) { /* listening */ - if (event & POLLIN) - { - /* incoming connection */ - sock->pmask |= FD_ACCEPT; - sock->errors[FD_ACCEPT_BIT] = 0; - sock->hmask |= FD_ACCEPT; - } - else if (event & (POLLERR|POLLHUP)) - { - /* failed incoming connection? */ - sock->pmask |= FD_ACCEPT; - sock->errors[FD_ACCEPT_BIT] = sock_error( fd ); - sock->hmask |= FD_ACCEPT; - } + if (event & (POLLERR|POLLHUP)) + error = sock_error( fd ); } else { @@ -395,44 +426,15 @@ static void sock_poll_event( struct fd *fd, int event ) } } - if ( event & POLLIN ) - { - sock->pmask |= FD_READ; - sock->hmask |= FD_READ; - sock->errors[FD_READ_BIT] = 0; - if (debug_level) - fprintf(stderr, "socket %p is readable\n", sock ); - } - - if (event & POLLOUT) - { - sock->pmask |= FD_WRITE; - sock->hmask |= FD_WRITE; - sock->errors[FD_WRITE_BIT] = 0; - if (debug_level) - fprintf(stderr, "socket %p is writable\n", sock); - } - if (event & POLLPRI) - { - sock->pmask |= FD_OOB; - sock->hmask |= FD_OOB; - sock->errors[FD_OOB_BIT] = 0; - if (debug_level) - fprintf(stderr, "socket %p got OOB data\n", sock); - } - if ( (hangup_seen || event & (POLLHUP|POLLERR)) && (sock->state & (FD_READ|FD_WRITE)) ) { - sock->errors[FD_CLOSE_BIT] = sock_error( fd ); + error = sock_error( fd ); if ( (event & POLLERR) || ( sock_shutdown_type == SOCK_SHUTDOWN_EOF && (event & POLLHUP) )) sock->state &= ~FD_WRITE; sock->state &= ~FD_READ; - sock->pmask |= FD_CLOSE; - sock->hmask |= FD_CLOSE; if (debug_level) - fprintf(stderr, "socket %p aborted by error %d, event: %x - removing from select loop\n", - sock, sock->errors[FD_CLOSE_BIT], event); + fprintf(stderr, "socket %p aborted by error %d, event: %x\n", sock, error, event); } if (hangup_seen) @@ -440,9 +442,7 @@ static void sock_poll_event( struct fd *fd, int event ) } sock_dispatch_asyncs( sock, event ); - - /* wake up anyone waiting for whatever just happened */ - sock_wake_up( sock ); + sock_dispatch_events( sock, prevstate, event, error ); /* if anyone is stupid enough to wait on the socket object itself, * maybe we should wake them up too, just in case? */

1 0

David Hedberg : include: Add IShellItemArray and IShellItemFilter interface declarations.
by Alexandre Julliard July 20, 2010

July 20, 2010

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

David Hedberg : include: Add IEnumShellItems interface declaration.
by Alexandre Julliard July 20, 2010

July 20, 2010

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