August 2009 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Get rid of handling post data in IPersistMoniker:: Load hack.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 13a84dea3013fff72490c9381a4032f1d10ff3f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a84dea3013fff72490c9381… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 24 20:12:51 2009 +0200 mshtml: Get rid of handling post data in IPersistMoniker::Load hack. --- dlls/mshtml/persist.c | 131 +------------------------------------------------ 1 files changed, 1 insertions(+), 130 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index f2a3df7..6c1a0e5 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -39,129 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -#define USER_AGENT "User-Agent:" -#define CONTENT_TYPE "Content-Type:" - -static int fix_headers(char *buf, DWORD post_len) -{ - char *ptr = buf, *ptr2; - - while(*ptr && (ptr[0] != '\r' || ptr[1] != '\n')) { - for(ptr2=ptr+1; *ptr2 && (ptr2[0] != '\r' || ptr2[1] != '\n'); ptr2++); - - if(*ptr2) - ptr2 += 2; - - if(!strncasecmp(ptr, USER_AGENT, sizeof(USER_AGENT)-1)) { - FIXME("Ignoring User-Agent header\n"); - memmove(ptr, ptr2, strlen(ptr2)+1); - }else if(!post_len && !strncasecmp(ptr, CONTENT_TYPE, sizeof(CONTENT_TYPE)-1)) { - TRACE("Ignoring Content-Type header\n"); - memmove(ptr, ptr2, strlen(ptr2)+1); - }else { - ptr = ptr2; - } - } - - *ptr = 0; - return ptr-buf; -} - -static nsIInputStream *get_post_data_stream(IBindCtx *bctx) -{ - nsIInputStream *ret = NULL; - IUnknown *unk; - IBindStatusCallback *callback; - IServiceProvider *service_provider; - BINDINFO bindinfo; - DWORD bindf = 0; - DWORD post_len = 0, headers_len = 0; - LPWSTR headers = NULL; - WCHAR emptystr[] = {0}; - char *data; - HRESULT hres; - - static WCHAR _BSCB_Holder_[] = - {'_','B','S','C','B','_','H','o','l','d','e','r','_',0}; - - - /* FIXME: This should be done in URLMoniker */ - if(!bctx) - return NULL; - - hres = IBindCtx_GetObjectParam(bctx, _BSCB_Holder_, &unk); - if(FAILED(hres)) - return NULL; - - hres = IUnknown_QueryInterface(unk, &IID_IBindStatusCallback, (void**)&callback); - if(FAILED(hres)) { - IUnknown_Release(unk); - return NULL; - } - - hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&service_provider); - IUnknown_Release(unk); - if(SUCCEEDED(hres)) { - IHttpNegotiate *http_negotiate; - - hres = IServiceProvider_QueryService(service_provider, &IID_IHttpNegotiate, &IID_IHttpNegotiate, - (void**)&http_negotiate); - if(SUCCEEDED(hres)) { - hres = IHttpNegotiate_BeginningTransaction(http_negotiate, emptystr, - emptystr, 0, &headers); - IHttpNegotiate_Release(http_negotiate); - - if(SUCCEEDED(hres) && headers) - headers_len = WideCharToMultiByte(CP_ACP, 0, headers, -1, NULL, 0, NULL, NULL); - } - - IServiceProvider_Release(service_provider); - } - - memset(&bindinfo, 0, sizeof(bindinfo)); - bindinfo.cbSize = sizeof(bindinfo); - - hres = IBindStatusCallback_GetBindInfo(callback, &bindf, &bindinfo); - - if(SUCCEEDED(hres) && bindinfo.dwBindVerb == BINDVERB_POST) - post_len = bindinfo.cbstgmedData; - - if(headers_len || post_len) { - int len = 0; - - static const char content_length[] = "Content-Length: %u\r\n\r\n"; - - data = heap_alloc(headers_len+post_len+sizeof(content_length)+10); - - if(headers_len) { - WideCharToMultiByte(CP_ACP, 0, headers, -1, data, headers_len, NULL, NULL); - len = fix_headers(data, post_len); - if(len >= 2 && (data[len-1] != '\n' || data[len-2] != '\r')) { - data[len++] = '\r'; - data[len++] = '\n'; - } - } - - if(post_len) { - sprintf(data+len, content_length, post_len); - len += strlen(data+len); - - memcpy(data+len, bindinfo.stgmedData.u.hGlobal, post_len); - } - - TRACE("data = %s\n", debugstr_an(data, len+post_len)); - - if(len) - ret = create_nsstream(data, len+post_len); - } - - CoTaskMemFree(headers); - ReleaseBindInfo(&bindinfo); - IBindStatusCallback_Release(callback); - - return ret; -} - static BOOL use_gecko_script(LPCWSTR url) { static const WCHAR fileW[] = {'f','i','l','e',':'}; @@ -304,16 +181,10 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO push_task(task); if(This->nscontainer) { - nsIInputStream *post_data_stream = get_post_data_stream(pibc); - This->nscontainer->bscallback = bscallback; nsres = nsIWebNavigation_LoadURI(This->nscontainer->navigation, url, - LOAD_FLAGS_NONE, NULL, post_data_stream, NULL); + LOAD_FLAGS_NONE, NULL, NULL, NULL); This->nscontainer->bscallback = NULL; - - if(post_data_stream) - nsIInputStream_Release(post_data_stream); - if(NS_FAILED(nsres)) { WARN("LoadURI failed: %08x\n", nsres); IUnknown_Release((IUnknown*)bscallback);

1 0

Ge van Geldorp : shlwapi/tests: Remove test that crashes on Win7.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: d4ebffd24e4607dd3fea1985947345a1a43368a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4ebffd24e4607dd3fea19859… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Aug 24 21:24:05 2009 +0200 shlwapi/tests: Remove test that crashes on Win7. --- dlls/shlwapi/tests/istream.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 66465b8..67d1fe2 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -177,8 +177,7 @@ static void test_IStream_invalid_operations(IStream * stream, DWORD mode) /* IStream::Clone */ - ret = IStream_Clone(stream, NULL); - ok(ret == E_NOTIMPL, "expected E_NOTIMPL, got 0x%08x\n", ret); + /* Passing a NULL pointer for the second IStream::Clone param crashes on Win7 */ clone = NULL; ret = IStream_Clone(stream, &clone);

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.28
by Jeremy Newman 24 Aug '09

24 Aug '09

Module: website Branch: master Commit: a49af7c497af200841102d0ad2506bb7ba386d55 URL: http://source.winehq.org/git/website.git/?a=commit;h=a49af7c497af200841102d… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Aug 21 20:51:09 2009 +0200 Polish translation for release 1.1.28 --- news/pl/2009082101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pl/2009082101.xml b/news/pl/2009082101.xml new file mode 100644 index 0000000..ba2f4d0 --- /dev/null +++ b/news/pl/2009082101.xml @@ -0,0 +1,16 @@ +<news> +<date>Sierpień 21, 2009</date> +<title>Wydano Wine 1.1.28</title> +<body> + Wydanie rozwojowe Wine 1.1.28 jest już dostępne. + <a href="{$root}/announce/1.1.28">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla protokołu IRDA.</li> + <li>Szybsze tworzenie wineprefix.</li> + <li>Remapowanie osi z dżojstikami evdev.</li> + <li>Więcej formatów obrazków w WindowsCodecs.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.28.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Ge van Geldorp : ntdll/tests: Add acceptable status codes for Win7.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 98fdb660be00624ea6a5465d861354e0ef114f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=98fdb660be00624ea6a5465d8… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Aug 24 14:28:55 2009 +0200 ntdll/tests: Add acceptable status codes for Win7. --- dlls/ntdll/tests/om.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index ed3eb46..d5cf158 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -63,8 +63,8 @@ static void test_case_sensitive (void) ok(status == STATUS_SUCCESS, "Failed to create Mutant(%08x)\n", status); status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, FALSE, FALSE); - ok(status == STATUS_OBJECT_NAME_COLLISION, - "NtCreateEvent should have failed with STATUS_OBJECT_NAME_COLLISION got(%08x)\n", status); + ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH, + "NtCreateEvent should have failed with STATUS_OBJECT_NAME_COLLISION or STATUS_OBJECT_TYPE_MISMATCH got (%08x)\n", status); pRtlInitUnicodeString(&str, buffer2); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); @@ -82,8 +82,8 @@ static void test_case_sensitive (void) pRtlInitUnicodeString(&str, buffer4); InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE); - ok(status == STATUS_OBJECT_NAME_COLLISION, - "NtCreateMutant should have failed with STATUS_OBJECT_NAME_COLLISION got(%08x)\n", status); + ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH, + "NtCreateMutant should have failed with STATUS_OBJECT_NAME_COLLISION or STATUS_OBJECT_TYPE_MISMATCH got (%08x)\n", status); status = pNtCreateEvent(&h, GENERIC_ALL, &attr, FALSE, FALSE); ok(status == STATUS_OBJECT_NAME_COLLISION,

1 0

Ge van Geldorp : ntdll/tests: Fix info tests on Win7.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 4bc7a3eb9276c6286119516bda833bd7f3fe9c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bc7a3eb9276c6286119516bd… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Aug 24 14:28:31 2009 +0200 ntdll/tests: Fix info tests on Win7. --- dlls/ntdll/tests/info.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 8027065..6e3851d 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -121,19 +121,21 @@ static void test_query_cpu(void) static void test_query_performance(void) { NTSTATUS status; + ULONG FullLength; ULONG ReturnLength; SYSTEM_PERFORMANCE_INFORMATION spi; + BYTE Buffer[sizeof(SYSTEM_PERFORMANCE_INFORMATION) + 2]; - status = pNtQuerySystemInformation(SystemPerformanceInformation, &spi, 0, &ReturnLength); + status = pNtQuerySystemInformation(SystemPerformanceInformation, Buffer, 0, &FullLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - status = pNtQuerySystemInformation(SystemPerformanceInformation, &spi, sizeof(spi), &ReturnLength); + status = pNtQuerySystemInformation(SystemPerformanceInformation, Buffer, sizeof(spi), &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( sizeof(spi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); - status = pNtQuerySystemInformation(SystemPerformanceInformation, &spi, sizeof(spi) + 2, &ReturnLength); + status = pNtQuerySystemInformation(SystemPerformanceInformation, &Buffer, sizeof(Buffer), &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(spi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( ReturnLength == min(FullLength, sizeof(Buffer)), "Inconsistent length %d\n", ReturnLength); /* Not return values yet, as struct members are unknown */ } @@ -746,6 +748,7 @@ static void test_query_process_handlecount(void) NTSTATUS status; ULONG ReturnLength; DWORD handlecount; + BYTE buffer[2 * sizeof(DWORD)]; HANDLE process; status = pNtQueryInformationProcess(NULL, ProcessHandleCount, NULL, sizeof(handlecount), NULL); @@ -773,8 +776,9 @@ static void test_query_process_handlecount(void) ok( sizeof(handlecount) == ReturnLength, "Inconsistent length %d\n", ReturnLength); CloseHandle(process); - status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessHandleCount, &handlecount, sizeof(handlecount) * 2, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessHandleCount, buffer, sizeof(buffer), &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH || status == STATUS_SUCCESS, + "Expected STATUS_INFO_LENGTH_MISMATCH or STATUS_SUCCESS, got %08x\n", status); ok( sizeof(handlecount) == ReturnLength, "Inconsistent length %d\n", ReturnLength); /* Check if we have some return values */

1 0

Ge van Geldorp : shlwapi/tests: Prevent buffer overflow.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 2245e2c17e857c0c9795b9d3afec4eacd013ce67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2245e2c17e857c0c9795b9d3a… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Aug 24 14:25:40 2009 +0200 shlwapi/tests: Prevent buffer overflow. --- dlls/shlwapi/tests/path.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 52eee2d..5d64a24 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -690,7 +690,7 @@ static void test_PathAppendA(void) { char path[MAX_PATH]; char too_long[LONG_LEN]; - char one[HALF_LEN], two[HALF_LEN]; + char half[HALF_LEN]; BOOL res; lstrcpy(path, "C:\\one"); @@ -803,16 +803,16 @@ static void test_PathAppendA(void) "Expected length of path to be zero, got %i\n", lstrlen(path)); /* both params combined are too long */ - memset(one, 'a', HALF_LEN); - one[HALF_LEN - 1] = '\0'; - memset(two, 'b', HALF_LEN); - two[HALF_LEN - 1] = '\0'; + memset(path, 'a', HALF_LEN); + path[HALF_LEN - 1] = '\0'; + memset(half, 'b', HALF_LEN); + half[HALF_LEN - 1] = '\0'; SetLastError(0xdeadbeef); - res = PathAppendA(one, two); + res = PathAppendA(path, half); ok(!res, "Expected failure\n"); - ok(lstrlen(one) == 0 || - broken(lstrlen(one) == (HALF_LEN - 1)), /* Win95 and some W2K */ - "Expected length of one to be zero, got %i\n", lstrlen(one)); + ok(lstrlen(path) == 0 || + broken(lstrlen(path) == (HALF_LEN - 1)), /* Win95 and some W2K */ + "Expected length of path to be zero, got %i\n", lstrlen(path)); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); }

1 0

Ge van Geldorp : netapi32/tests: Fix tests on Win7.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 1b0648229db606bcf03e97dfe224a26a77866c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b0648229db606bcf03e97dfe… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Aug 24 14:19:11 2009 +0200 netapi32/tests: Fix tests on Win7. --- dlls/netapi32/tests/wksta.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index e0c16d3..c5929de 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -173,7 +173,8 @@ static void run_wkstatransportenum_tests(void) ok(bufPtr != NULL, "got data back\n"); ok(entriesRead > 0, "read at least one transport\n"); - ok(totalEntries > 0, "at least one transport\n"); + ok(totalEntries > 0 || broken(totalEntries == 0) /* Win7 */, + "at least one transport\n"); pNetApiBufferFree(bufPtr); } } @@ -198,7 +199,10 @@ START_TEST(wksta) } if (init_wksta_tests()) { - run_get_comp_name_tests(); + if (pNetpGetComputerName) + run_get_comp_name_tests(); + else + win_skip("Function NetpGetComputerName not available\n"); run_wkstausergetinfo_tests(); run_wkstatransportenum_tests(); }

1 0

Vladimir Pankratov : shdoclc: Correct Russian translation.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: e83d1488d2918817a3b01c2e7a36f779e98bd76c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e83d1488d2918817a3b01c2e7… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Sun Aug 23 12:17:10 2009 +0500 shdoclc: Correct Russian translation. --- dlls/shdoclc/Ru.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdoclc/Ru.rc b/dlls/shdoclc/Ru.rc index cc619f2..06ca719 100644 --- a/dlls/shdoclc/Ru.rc +++ b/dlls/shdoclc/Ru.rc @@ -46,7 +46,7 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "&Копировать фон", IDM_COPYBACKGROUND MENUITEM "Сохранить как &элемент рабочего стола...", IDM_SETDESKTOPITEM MENUITEM SEPARATOR - MENUITEM "Выбрать Вс&ё", IDM_SELECTALL + MENUITEM "Выделить вс&ё", IDM_SELECTALL MENUITEM "Вс&тавить", IDM_PASTE MENUITEM SEPARATOR MENUITEM "Создать &ярлык", IDM_CREATESHORTCUT

1 0

Hwang YunSong : winecfg: Updated Korean resource.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 5b441148850045f36ad07cab160b4fecf7bc0449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b441148850045f36ad07cab1… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Aug 24 09:20:26 2009 +0900 winecfg: Updated Korean resource. --- programs/winecfg/Ko.rc | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 6f13e0c..bf06647 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -126,6 +126,17 @@ BEGIN PUSHBUTTON "��",IDCANCEL,57,74,45,14,WS_GROUP END +IDD_DRIVECHOOSE DIALOG DISCARDABLE 60, 70, 170, 60 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "��̺� �� " +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDC_DRIVESA2Z,15,10,75,230,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Ȯ��",IDOK,105,10,45,14,WS_GROUP + PUSHBUTTON "��",IDCANCEL,105,30,45,14,WS_GROUP +END + + IDD_DRIVECFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" @@ -265,7 +276,7 @@ BEGIN IDS_CONFIRM_DELETE_C "�� ϵ� ��̺� C�� ⸦ ��մϱ�?\n\n��κ�� α׷�� C��̺갡 �ִٰ� ��ϰ�, �� ٿ�ɰ��Դϴ�. �� ϱ⸦ ��Ѵٸ� �ݵ�� ٽ� ��ʽÿ�!" IDS_COL_DRIVELETTER "��" IDS_COL_DRIVEMAPPING "��̺� �Ҵ�" - IDS_NO_DRIVE_C "�� C��̺긦 �� ʽ��ϴ�. �̰�� ƴմϴ�.\n\n��̺� �ǿ�� [�߰�]�� Ŭ��ؼ� �� ʽÿ�!\n" + IDS_NO_DRIVE_C "�� C��̺긦 �� ʽ��ϴ�. �̰�� ƴմϴ�.\n\n��̺� �ǿ�� '�߰�'�� Ŭ��ؼ� �� ʽÿ�!\n" END STRINGTABLE DISCARDABLE @@ -289,7 +300,7 @@ BEGIN IDS_DEVICES_MIDIIN "MIDI �Է� ��ġ" IDS_DEVICES_AUX "Aux ��ġ" IDS_DEVICES_MIXER "Mixer ��ġ" - IDS_UNAVAILABLE_DRIVER "��Ʈ�� ̹�� ߰ߵǾ��ϴ�!\n\n %s�� Ʈ�� ڽ��ϱ�?" + IDS_UNAVAILABLE_DRIVER "��Ʈ�� ̹�� ߰ߵǾ��ϴ�!\n\n '%s'�� Ʈ�� ڽ��ϱ�?" IDS_WARNING "��" END

1 0

Huw Davies : msdaps: Implement ISessionProperties_SetProperties proxy and stub.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 835c097d4c6dbcbb978782dfeed390753b27d76c URL: http://source.winehq.org/git/wine.git/?a=commit;h=835c097d4c6dbcbb978782dfe… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 24 10:50:23 2009 +0100 msdaps: Implement ISessionProperties_SetProperties proxy and stub. --- dlls/msdaps/usrmarshal.c | 48 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 4815278..0b59465 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -296,16 +296,56 @@ HRESULT __RPC_STUB ISessionProperties_GetProperties_Stub(ISessionProperties* Thi HRESULT CALLBACK ISessionProperties_SetProperties_Proxy(ISessionProperties* This, ULONG cPropertySets, DBPROPSET rgPropertySets[]) { - FIXME("(%p, %d, %p): stub\n", This, cPropertySets, rgPropertySets); - return E_NOTIMPL; + ULONG prop_set, prop, total_props = 0; + HRESULT hr; + IErrorInfo *error; + DBPROPSTATUS *status; + + TRACE("(%p, %d, %p)\n", This, cPropertySets, rgPropertySets); + + for(prop_set = 0; prop_set < cPropertySets; prop_set++) + total_props += rgPropertySets[prop_set].cProperties; + + if(total_props == 0) return S_OK; + + status = CoTaskMemAlloc(total_props * sizeof(*status)); + if(!status) return E_OUTOFMEMORY; + + hr = ISessionProperties_RemoteSetProperties_Proxy(This, cPropertySets, rgPropertySets, + total_props, status, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + + total_props = 0; + for(prop_set = 0; prop_set < cPropertySets; prop_set++) + for(prop = 0; prop < rgPropertySets[prop_set].cProperties; prop++) + rgPropertySets[prop_set].rgProperties[prop].dwStatus = status[total_props++]; + + CoTaskMemFree(status); + return hr; } HRESULT __RPC_STUB ISessionProperties_SetProperties_Stub(ISessionProperties* This, ULONG cPropertySets, DBPROPSET *rgPropertySets, ULONG cTotalProps, DBPROPSTATUS *rgPropStatus, IErrorInfo **ppErrorInfoRem) { - FIXME("(%p, %d, %p, %d, %p, %p): stub\n", This, cPropertySets, rgPropertySets, cTotalProps, + ULONG prop_set, prop, total_props = 0; + HRESULT hr; + + TRACE("(%p, %d, %p, %d, %p, %p)\n", This, cPropertySets, rgPropertySets, cTotalProps, rgPropStatus, ppErrorInfoRem); - return E_NOTIMPL; + + *ppErrorInfoRem = NULL; + hr = ISessionProperties_SetProperties(This, cPropertySets, rgPropertySets); + if(FAILED(hr)) GetErrorInfo(0, ppErrorInfoRem); + + for(prop_set = 0; prop_set < cPropertySets; prop_set++) + for(prop = 0; prop < rgPropertySets[prop_set].cProperties; prop++) + rgPropStatus[total_props++] = rgPropertySets[prop_set].rgProperties[prop].dwStatus; + + return hr; } HRESULT CALLBACK IOpenRowset_OpenRowset_Proxy(IOpenRowset* This, IUnknown *pUnkOuter, DBID *pTableID, DBID *pIndexID,

1 0