June 2009 - Wine-Commits - list.winehq.org

Vincent Povirk : ole32: Don' t ignore a failure to delete the old element in CreateStorage.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: 6f05770fbf4fb47937b5266b3820cca99141ebd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f05770fbf4fb47937b5266b3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 29 16:54:06 2009 -0500 ole32: Don't ignore a failure to delete the old element in CreateStorage. --- dlls/ole32/storage32.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index ff95fad..9266bb7 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1232,7 +1232,11 @@ static HRESULT WINAPI StorageImpl_CreateStorage( */ if (STGM_CREATE_MODE(grfMode) == STGM_CREATE && STGM_ACCESS_MODE(This->base.openFlags) != STGM_READ) - IStorage_DestroyElement(iface, pwcsName); + { + hr = IStorage_DestroyElement(iface, pwcsName); + if (FAILED(hr)) + return hr; + } else { WARN("file already exists\n");

1 0

Eric Pouech : winhlp32: Properly handle a syntax error inside a macro.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: b936855d0765b3f1565e8a698b4a3b03924e7371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b936855d0765b3f1565e8a698… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat May 30 14:26:21 2009 +0200 winhlp32: Properly handle a syntax error inside a macro. --- programs/winhlp32/macro.lex.l | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l index f3366b0..4442473 100644 --- a/programs/winhlp32/macro.lex.l +++ b/programs/winhlp32/macro.lex.l @@ -293,13 +293,15 @@ BOOL MACRO_ExecuteMacro(LPCSTR macro) break; default: WINE_WARN("got unexpected type %s\n", ts(t)); - return 0; + YY_FLUSH_BUFFER; + ret = FALSE; + goto done; } switch (t = yylex()) { case EMPTY: goto done; case ';': break; - default: ret = FALSE; goto done; + default: ret = FALSE; YY_FLUSH_BUFFER; goto done; } }

1 0

Vincent Povirk : ole32: Fix crash when calling CreateStorage on read only storage.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: 93a155381fe3dbba61ac7e367e060cdf7f873bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a155381fe3dbba61ac7e367… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 29 16:40:15 2009 -0500 ole32: Fix crash when calling CreateStorage on read only storage. --- dlls/ole32/storage32.c | 3 ++- dlls/ole32/tests/storage32.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index d68f09f..9f3930e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1230,7 +1230,8 @@ static HRESULT WINAPI StorageImpl_CreateStorage( /* * An element with this name already exists */ - if (STGM_CREATE_MODE(grfMode) == STGM_CREATE) + if (STGM_CREATE_MODE(grfMode) == STGM_CREATE && + STGM_ACCESS_MODE(This->base.openFlags) != STGM_READ) IStorage_DestroyElement(iface, pwcsName); else { diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index f932765..84c4b0f 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1314,13 +1314,11 @@ void test_readonly(void) if (SUCCEEDED(hr)) IStream_Release(stream); -#if 0 /* crashes on Wine */ /* CreateStorage on read-only storage, name exists */ hr = IStorage_CreateStorage( stg2, streamW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READ, 0, 0, &stg3 ); ok(hr == STG_E_FILEALREADYEXISTS, "should fail, res=%x\n", hr); if (SUCCEEDED(hr)) IStream_Release(stg3); -#endif /* CreateStorage on read-only storage, name does not exist */ hr = IStorage_CreateStorage( stg2, storageW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READ, 0, 0, &stg3 );

1 0

Paul Vriens : user32: Fix Dutch translations.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: 37bba53eb7f75ad6b24c8cac1eec3d5bc2fee559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37bba53eb7f75ad6b24c8cac1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat May 30 20:36:13 2009 +0200 user32: Fix Dutch translations. --- dlls/user32/resources/user32_Nl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/resources/user32_Nl.rc b/dlls/user32/resources/user32_Nl.rc index 3993ab5..2df1b74 100644 --- a/dlls/user32/resources/user32_Nl.rc +++ b/dlls/user32/resources/user32_Nl.rc @@ -58,8 +58,8 @@ BEGIN PUSHBUTTON "N&egeer", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Ja", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Nee", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Try Again", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Continue", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Probeer opnieuw", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Verder", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END

1 0

Paul Vriens : shell32: Fix Dutch translations.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: c579ebdff6358504d8bde9a786e3a8f88d21856b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c579ebdff6358504d8bde9a78… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat May 30 20:34:04 2009 +0200 shell32: Fix Dutch translations. --- dlls/shell32/shell32_Nl.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index 71a0545..1de7bf0 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -84,7 +84,7 @@ BEGIN MENUITEM "K&nippen", FCIDM_SHVIEW_CUT MENUITEM "&Kopieren", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "Creeer &Link", FCIDM_SHVIEW_CREATELINK + MENUITEM "Creëer &Link", FCIDM_SHVIEW_CREATELINK MENUITEM "Ver&wijder", FCIDM_SHVIEW_DELETE MENUITEM "&Hernoemen", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR @@ -110,7 +110,7 @@ BEGIN POPUP "&Help" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "&Over Controle Paneel...", IDM_CPANEL_ABOUT END END @@ -210,7 +210,7 @@ STRINGTABLE IDS_DESKTOP "Bureaublad" IDS_MYCOMPUTER "Mijn Computer" IDS_RECYCLEBIN_FOLDER_NAME "Vuilnisbak" - IDS_CONTROLPANEL "Control Panel" + IDS_CONTROLPANEL "Controle Paneel" /* context menus */ IDS_VIEW_LARGE "Grote Icons"

1 0

Jacek Caban : wininet: Added support for decompressing gzip encoded content .
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: 11ca05f6aea51f20de2baf0c1e73a2e243b0c972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11ca05f6aea51f20de2baf0c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 29 23:35:13 2009 +0200 wininet: Added support for decompressing gzip encoded content. --- configure | 84 +++++++++++++++++++- configure.ac | 10 ++- dlls/wininet/Makefile.in | 2 +- dlls/wininet/http.c | 197 +++++++++++++++++++++++++++++++++++++++++++--- dlls/wininet/internet.h | 5 + include/config.h.in | 6 ++ 6 files changed, 289 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11ca05f6aea51f20de2ba…

1 0

Jacek Caban : wininet: Test gzip encoded read.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: ac57ea14f52c7c1c86d04bf77db1f0673430bb7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac57ea14f52c7c1c86d04bf77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 29 23:35:36 2009 +0200 wininet: Test gzip encoded read. --- dlls/wininet/tests/http.c | 107 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 82 insertions(+), 25 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 7e3c08c..326296a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -105,6 +105,35 @@ static CHAR status_string[MAX_INTERNET_STATUS][MAX_STATUS_NAME]; static HANDLE hCompleteEvent; +#define TESTF_REDIRECT 0x01 +#define TESTF_COMPRESSED 0x02 +#define TESTF_ALLOW_COOKIE 0x04 + +typedef struct { + const char *url; + const char *redirected_url; + const char *host; + const char *path; + DWORD flags; +} test_data_t; + +static const test_data_t test_data[] = { + { + "http://test.winehq.org/testredirect", + "http://test.winehq.org/hello.html", + "test.winehq.org", + "/testredirect", + TESTF_REDIRECT + }, + { + "http://www.codeweavers.com/", + "http://www.codeweavers.com/", + "www.codeweavers.com", + "", + TESTF_COMPRESSED|TESTF_ALLOW_COOKIE + } +}; + static INTERNET_STATUS_CALLBACK (WINAPI *pInternetSetStatusCallbackA)(HINTERNET ,INTERNET_STATUS_CALLBACK); @@ -239,7 +268,7 @@ static VOID WINAPI callback( } } -static void InternetReadFile_test(int flags) +static void InternetReadFile_test(int flags, const test_data_t *test) { BOOL res; CHAR buffer[4000]; @@ -250,10 +279,11 @@ static void InternetReadFile_test(int flags) hCompleteEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - trace("Starting InternetReadFile test with flags 0x%x\n",flags); + trace("Starting InternetReadFile test with flags 0x%x on url %s\n",flags,test->url); trace("InternetOpenA <--\n"); - hi = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, flags); + hi = InternetOpenA((test->flags & TESTF_COMPRESSED) ? "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)" : "", + INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, flags); ok((hi != 0x0),"InternetOpen failed with error %u\n", GetLastError()); trace("InternetOpenA -->\n"); @@ -264,7 +294,7 @@ static void InternetReadFile_test(int flags) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); trace("InternetConnectA <--\n"); - hic=InternetConnectA(hi, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, + hic=InternetConnectA(hi, test->host, INTERNET_INVALID_PORT_NUMBER, NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); ok((hic != 0x0),"InternetConnect failed with error %u\n", GetLastError()); trace("InternetConnectA -->\n"); @@ -275,7 +305,7 @@ static void InternetReadFile_test(int flags) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); trace("HttpOpenRequestA <--\n"); - hor = HttpOpenRequestA(hic, "GET", "/testredirect", NULL, NULL, types, + hor = HttpOpenRequestA(hic, "GET", test->path, NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, 0xdeadbead); if (hor == 0x0 && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { @@ -295,7 +325,7 @@ static void InternetReadFile_test(int flags) length = sizeof(buffer); res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length); ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); - ok(!strcmp(buffer, "http://test.winehq.org/testredirect"), "Wrong URL %s\n", buffer); + ok(!strcmp(buffer, test->url), "Wrong URL %s, expected %s\n", buffer, test->url); length = sizeof(buffer); res = HttpQueryInfoA(hor, HTTP_QUERY_RAW_HEADERS, buffer, &length, 0x0); @@ -306,6 +336,8 @@ static void InternetReadFile_test(int flags) CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); + if(test->flags & TESTF_ALLOW_COOKIE) + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); if (first_connection_to_test_url) { SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME); @@ -322,12 +354,14 @@ static void InternetReadFile_test(int flags) SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_WINE_ALLOW(INTERNET_STATUS_CONNECTED_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); - SET_EXPECT2(INTERNET_STATUS_SENDING_REQUEST, 2); - SET_EXPECT2(INTERNET_STATUS_REQUEST_SENT, 2); - SET_EXPECT2(INTERNET_STATUS_RECEIVING_RESPONSE, 2); - SET_EXPECT2(INTERNET_STATUS_RESPONSE_RECEIVED, 2); - SET_OPTIONAL2(INTERNET_STATUS_CLOSING_CONNECTION, 2); - SET_OPTIONAL2(INTERNET_STATUS_CONNECTION_CLOSED, 2); + SET_EXPECT2(INTERNET_STATUS_SENDING_REQUEST, (test->flags & TESTF_REDIRECT) ? 2 : 1); + SET_EXPECT2(INTERNET_STATUS_REQUEST_SENT, (test->flags & TESTF_REDIRECT) ? 2 : 1); + SET_EXPECT2(INTERNET_STATUS_RECEIVING_RESPONSE, (test->flags & TESTF_REDIRECT) ? 2 : 1); + SET_EXPECT2(INTERNET_STATUS_RESPONSE_RECEIVED, (test->flags & TESTF_REDIRECT) ? 2 : 1); + if(test->flags & TESTF_REDIRECT) { + SET_OPTIONAL2(INTERNET_STATUS_CLOSING_CONNECTION, 2); + SET_OPTIONAL2(INTERNET_STATUS_CONNECTION_CLOSED, 2); + } SET_EXPECT(INTERNET_STATUS_REDIRECT); SET_OPTIONAL(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_OPTIONAL(INTERNET_STATUS_CONNECTED_TO_SERVER); @@ -336,9 +370,16 @@ static void InternetReadFile_test(int flags) else SET_WINE_ALLOW(INTERNET_STATUS_REQUEST_COMPLETE); + if(test->flags & TESTF_COMPRESSED) { + BOOL b = TRUE; + + res = InternetSetOption(hor, INTERNET_OPTION_HTTP_DECODING, &b, sizeof(b)); + ok(res, "InternetSetOption failed: %08x\n", GetLastError()); + } + trace("HttpSendRequestA -->\n"); SetLastError(0xdeadbeef); - res = HttpSendRequestA(hor, "", -1, NULL, 0); + res = HttpSendRequestA(hor, (test->flags & TESTF_COMPRESSED) ? "Accept-Encoding: gzip, deflate" : "", -1, NULL, 0); if (flags & INTERNET_FLAG_ASYNC) ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); @@ -350,6 +391,8 @@ static void InternetReadFile_test(int flags) if (flags & INTERNET_FLAG_ASYNC) WaitForSingleObject(hCompleteEvent, INFINITE); + if(test->flags & TESTF_ALLOW_COOKIE) + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); if (first_connection_to_test_url) { CHECK_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); @@ -360,11 +403,12 @@ static void InternetReadFile_test(int flags) CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); } - CHECK_NOTIFIED2(INTERNET_STATUS_SENDING_REQUEST, 2); - CHECK_NOTIFIED2(INTERNET_STATUS_REQUEST_SENT, 2); - CHECK_NOTIFIED2(INTERNET_STATUS_RECEIVING_RESPONSE, 2); - CHECK_NOTIFIED2(INTERNET_STATUS_RESPONSE_RECEIVED, 2); - CHECK_NOTIFIED(INTERNET_STATUS_REDIRECT); + CHECK_NOTIFIED2(INTERNET_STATUS_SENDING_REQUEST, (test->flags & TESTF_REDIRECT) ? 2 : 1); + CHECK_NOTIFIED2(INTERNET_STATUS_REQUEST_SENT, (test->flags & TESTF_REDIRECT) ? 2 : 1); + CHECK_NOTIFIED2(INTERNET_STATUS_RECEIVING_RESPONSE, (test->flags & TESTF_REDIRECT) ? 2 : 1); + CHECK_NOTIFIED2(INTERNET_STATUS_RESPONSE_RECEIVED, (test->flags & TESTF_REDIRECT) ? 2 : 1); + if(test->flags & TESTF_REDIRECT) + CHECK_NOTIFIED(INTERNET_STATUS_REDIRECT); if (flags & INTERNET_FLAG_ASYNC) CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); else @@ -389,16 +433,24 @@ static void InternetReadFile_test(int flags) length = sizeof(buffer); res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length); ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); - ok(!strcmp(buffer, "http://test.winehq.org/hello.html"), "Wrong URL %s\n", buffer); + ok(!strcmp(buffer, test->redirected_url), "Wrong URL %s\n", buffer); length = 16; res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_LENGTH,&buffer,&length,0x0); - trace("Option 0x5 -> %i %s (%u)\n",res,buffer,GetLastError()); + trace("Option HTTP_QUERY_CONTENT_LENGTH -> %i %s (%u)\n",res,buffer,GetLastError()); + if(test->flags & TESTF_COMPRESSED) + ok(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, + "expected ERROR_HTTP_HEADER_NOT_FOUND, got %x (%u)\n", res, GetLastError()); length = 100; res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_TYPE,buffer,&length,0x0); buffer[length]=0; - trace("Option 0x1 -> %i %s\n",res,buffer); + trace("Option HTTP_QUERY_CONTENT_TYPE -> %i %s\n",res,buffer); + + length = 100; + res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_ENCODING,buffer,&length,0x0); + buffer[length]=0; + trace("Option HTTP_QUERY_CONTENT_ENCODING -> %i %s\n",res,buffer); SetLastError(0xdeadbeef); res = InternetReadFile(NULL, buffer, 100, &length); @@ -447,8 +499,10 @@ static void InternetReadFile_test(int flags) if (length == 0) break; } - CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); - CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2); + if(test->flags & TESTF_REDIRECT) { + CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2); + } abort: trace("aborting\n"); SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); @@ -2666,8 +2720,11 @@ START_TEST(http) else { init_status_tests(); - InternetReadFile_test(INTERNET_FLAG_ASYNC); - InternetReadFile_test(0); + InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[0]); + InternetReadFile_test(0, &test_data[0]); + first_connection_to_test_url = TRUE; + InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[1]); + InternetReadFile_test(0, &test_data[1]); InternetReadFileExA_test(INTERNET_FLAG_ASYNC); test_open_url_async(); test_async_HttpSendRequestEx();

1 0

Eric Pouech : winedbg: Pass NULL for some optionals parameters to MinidumpReadDumpStream.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: 277d64bef09735463287db58365ac81e76bdccc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277d64bef09735463287db583… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat May 30 14:19:26 2009 +0200 winedbg: Pass NULL for some optionals parameters to MinidumpReadDumpStream. --- programs/winedbg/tgt_minidump.c | 28 +++++++++++----------------- 1 files changed, 11 insertions(+), 17 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index ec8a5bb..9b40a1c 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -87,13 +87,11 @@ static inline struct tgt_process_minidump_data* private_data(struct dbg_process* static BOOL WINAPI tgt_process_minidump_read(HANDLE hProcess, const void* addr, void* buffer, SIZE_T len, SIZE_T* rlen) { - ULONG size; - MINIDUMP_DIRECTORY* dir; void* stream; if (!private_data(dbg_curr_process)->mapping) return FALSE; if (MiniDumpReadDumpStream(private_data(dbg_curr_process)->mapping, - MemoryListStream, &dir, &stream, &size)) + MemoryListStream, NULL, &stream, NULL)) { MINIDUMP_MEMORY_LIST* mml = stream; MINIDUMP_MEMORY_DESCRIPTOR* mmd = &mml->MemoryRanges[0]; @@ -141,12 +139,10 @@ static BOOL CALLBACK validate_file(PCWSTR name, void* user) static BOOL is_pe_module_embedded(struct tgt_process_minidump_data* data, MINIDUMP_MODULE* pe_mm) { - ULONG size; - MINIDUMP_DIRECTORY* dir; MINIDUMP_MODULE_LIST* mml; - if (MiniDumpReadDumpStream(data->mapping, Wine_ElfModuleListStream, &dir, - (void**)&mml, &size)) + if (MiniDumpReadDumpStream(data->mapping, Wine_ElfModuleListStream, NULL, + (void**)&mml, NULL)) { MINIDUMP_MODULE* mm; unsigned i; @@ -163,8 +159,6 @@ static BOOL is_pe_module_embedded(struct tgt_process_minidump_data* data, static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) { - ULONG size; - MINIDUMP_DIRECTORY* dir; void* stream; DWORD pid = 1; /* by default */ HANDLE hProc = (HANDLE)0x900DBAAD; @@ -178,7 +172,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) static WCHAR default_exec_name[] = {'<','m','i','n','i','d','u','m','p','-','e','x','e','c','>',0}; /* fetch PID */ - if (MiniDumpReadDumpStream(data->mapping, MiscInfoStream, &dir, &stream, &size)) + if (MiniDumpReadDumpStream(data->mapping, MiscInfoStream, NULL, &stream, NULL)) { MINIDUMP_MISC_INFO* mmi = stream; if (mmi->Flags1 & MINIDUMP_MISC1_PROCESS_ID) @@ -187,7 +181,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) /* fetch executable name (it's normally the first one in module list) */ lstrcpyW(exec_name, default_exec_name); - if (MiniDumpReadDumpStream(data->mapping, ModuleListStream, &dir, &stream, &size)) + if (MiniDumpReadDumpStream(data->mapping, ModuleListStream, NULL, &stream, NULL)) { mml = stream; if (mml->NumberOfModules) @@ -210,7 +204,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) } } - if (MiniDumpReadDumpStream(data->mapping, SystemInfoStream, &dir, &stream, &size)) + if (MiniDumpReadDumpStream(data->mapping, SystemInfoStream, NULL, &stream, NULL)) { MINIDUMP_SYSTEM_INFO* msi = stream; const char *str; @@ -306,7 +300,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) dbg_init(hProc, NULL, FALSE); - if (MiniDumpReadDumpStream(data->mapping, ThreadListStream, &dir, &stream, &size)) + if (MiniDumpReadDumpStream(data->mapping, ThreadListStream, NULL, &stream, NULL)) { MINIDUMP_THREAD_LIST* mtl = stream; ULONG i; @@ -318,8 +312,8 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) } } /* first load ELF modules, then do the PE ones */ - if (MiniDumpReadDumpStream(data->mapping, Wine_ElfModuleListStream, &dir, - &stream, &size)) + if (MiniDumpReadDumpStream(data->mapping, Wine_ElfModuleListStream, NULL, + &stream, NULL)) { WCHAR buffer[MAX_PATH]; @@ -338,7 +332,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) mm->SizeOfImage, NULL, SLMFLAG_VIRTUAL); } } - if (MiniDumpReadDumpStream(data->mapping, ModuleListStream, &dir, &stream, &size)) + if (MiniDumpReadDumpStream(data->mapping, ModuleListStream, NULL, &stream, NULL)) { WCHAR buffer[MAX_PATH]; @@ -360,7 +354,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) mm->SizeOfImage, NULL, SLMFLAG_VIRTUAL); } } - if (MiniDumpReadDumpStream(data->mapping, ExceptionStream, &dir, &stream, &size)) + if (MiniDumpReadDumpStream(data->mapping, ExceptionStream, NULL, &stream, NULL)) { MINIDUMP_EXCEPTION_STREAM* mes = stream;

1 0

Yuriy Kaminskiy : dsound: Fix segv on use-after-free in IDirectSoundNotifyImpl_Release.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: cb93f15e32230d29637492be78d410d46e73d7ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb93f15e32230d29637492be7… Author: Yuriy Kaminskiy <yumkam(a)mail.ru> Date: Sat May 30 20:59:13 2009 +0400 dsound: Fix segv on use-after-free in IDirectSoundNotifyImpl_Release. --- dlls/dsound/buffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 251c436..2d64341 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -82,8 +82,8 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(LPDIRECTSOUNDNOTIFY iface) TRACE("(%p) ref was %d\n", This, ref + 1); if (!ref) { - IDirectSoundBuffer_Release((LPDIRECTSOUNDBUFFER)This->dsb); This->dsb->notify = NULL; + IDirectSoundBuffer_Release((LPDIRECTSOUNDBUFFER)This->dsb); HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); }

1 0

Paul Vriens : winmm/tests: Remove an unreliable test.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: 1aa71ea39e31ecd87025e96d60c0640ca53e78bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa71ea39e31ecd87025e96d6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat May 30 20:43:31 2009 +0200 winmm/tests: Remove an unreliable test. --- dlls/winmm/tests/wave.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 6430667..b509f74 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -604,7 +604,6 @@ static void wave_out_test_deviceOut(int device, double duration, DWORD nSamplesPerSec = pwfx->nSamplesPerSec; BOOL has_volume = pcaps->dwSupport & WAVECAPS_VOLUME ? TRUE : FALSE; double paused = 0.0; - DWORD actual; DWORD_PTR callback = 0; DWORD_PTR callback_instance = 0; HANDLE thread = 0; @@ -724,7 +723,7 @@ static void wave_out_test_deviceOut(int device, double duration, } if (interactive && rc==MMSYSERR_NOERROR) { - DWORD start,end; + DWORD start; trace("Playing %g second %s at %5dx%2dx%d %2d header%s %d loop%s %d bytes %s %s\n",duration, sine ? "440Hz tone" : "silence",pwfx->nSamplesPerSec, pwfx->wBitsPerSample,pwfx->nChannels, headers, headers > 1 ? "s": " ", @@ -791,13 +790,6 @@ static void wave_out_test_deviceOut(int device, double duration, } } - /* Check the sound duration was at least 90% of the expected value */ - end=GetTickCount(); - actual = end - start; - trace("sound duration=%u ms\n",actual); - ok(actual > 900 * (duration+paused), - "The sound played for %u ms instead of %g ms\n", - actual,1000*(duration+paused)); for (i = 0; i < headers; i++) { ok(frags[i].dwFlags==(WHDR_DONE|WHDR_PREPARED), "WHDR_DONE WHDR_PREPARED expected, got %s\n",

1 0