January 2012 - Wine-Commits

Michael Stefaniuc : mshtml: Remove superfluous NULL pointer check before free (Smatch).
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 51f77f4983aea27db77dab58f30f83384ebb2d23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f77f4983aea27db77dab58f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 16 00:16:26 2012 +0100 mshtml: Remove superfluous NULL pointer check before free (Smatch). --- dlls/mshtml/persist.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 4167659..e66cbcb 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -77,10 +77,8 @@ void set_current_uri(HTMLWindow *window, IUri *uri) window->uri = NULL; } - if(window->url) { - SysFreeString(window->url); - window->url = NULL; - } + SysFreeString(window->url); + window->url = NULL; if(!uri) return;

1 0

Hans Leidekker : wininet: Add support for setting and retrieving the connect timeout.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 848cd8a2f553a7b809dd8e8dabf5262210a7db0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=848cd8a2f553a7b809dd8e8da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 13 15:15:20 2012 +0100 wininet: Add support for setting and retrieving the connect timeout. --- dlls/wininet/http.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e645d86..ca8cc60 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2151,6 +2151,13 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe return ERROR_SUCCESS; } } + case INTERNET_OPTION_CONNECT_TIMEOUT: + if (*size < sizeof(DWORD)) + return ERROR_INSUFFICIENT_BUFFER; + + *size = sizeof(DWORD); + *(DWORD *)buffer = req->connect_timeout; + return ERROR_SUCCESS; } return INET_QueryOption(hdr, option, buffer, size, unicode); @@ -2174,6 +2181,13 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, req->netconn->security_flags = flags; return ERROR_SUCCESS; } + case INTERNET_OPTION_CONNECT_TIMEOUT: + if (size != sizeof(DWORD)) + return ERROR_INVALID_PARAMETER; + + req->connect_timeout = *(DWORD *)buffer; + return ERROR_SUCCESS; + case INTERNET_OPTION_SEND_TIMEOUT: case INTERNET_OPTION_RECEIVE_TIMEOUT: TRACE("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT\n"); @@ -5438,6 +5452,8 @@ static void HTTPSESSION_Destroy(object_header_t *hdr) static DWORD HTTPSESSION_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) { + http_session_t *ses = (http_session_t *)hdr; + switch(option) { case INTERNET_OPTION_HANDLE_TYPE: TRACE("INTERNET_OPTION_HANDLE_TYPE\n"); @@ -5448,6 +5464,15 @@ static DWORD HTTPSESSION_QueryOption(object_header_t *hdr, DWORD option, void *b *size = sizeof(DWORD); *(DWORD*)buffer = INTERNET_HANDLE_TYPE_CONNECT_HTTP; return ERROR_SUCCESS; + case INTERNET_OPTION_CONNECT_TIMEOUT: + TRACE("INTERNET_OPTION_CONNECT_TIMEOUT\n"); + + if (*size < sizeof(DWORD)) + return ERROR_INSUFFICIENT_BUFFER; + + *size = sizeof(DWORD); + *(DWORD *)buffer = ses->connect_timeout; + return ERROR_SUCCESS; } return INET_QueryOption(hdr, option, buffer, size, unicode); @@ -5470,6 +5495,11 @@ static DWORD HTTPSESSION_SetOption(object_header_t *hdr, DWORD option, void *buf if (!(ses->password = heap_strdupW(buffer))) return ERROR_OUTOFMEMORY; return ERROR_SUCCESS; } + case INTERNET_OPTION_CONNECT_TIMEOUT: + { + ses->connect_timeout = *(DWORD *)buffer; + return ERROR_SUCCESS; + } default: break; }

1 0

Piotr Caban : msvcp90: Fix mistakes in spec file.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 4381cabf9a383b666830492abb9bdc9d6745256d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4381cabf9a383b666830492ab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 16 11:39:18 2012 +0100 msvcp90: Fix mistakes in spec file. --- dlls/msvcp90/msvcp90.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 2bf62c8..ff25af1 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2397,7 +2397,7 @@ @ cdecl -arch=win64 ?_Grow@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IEAA_N_K_N(a)Z(ptr long long) basic_string_wchar_grow @ thiscall -arch=win32 ?_Hexdig@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABEHDDDD(a)Z(ptr long long long long) MSVCP_num_get_char__Hexdig @ cdecl -arch=win64 ?_Hexdig@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAHDDDD(a)Z(ptr long long long long) MSVCP_num_get_char__Hexdig -@ cdecl -arch=win32 ?_Hexdig@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABEHGGGG(a)Z(ptr long long long long) MSVCP_num_get_wchar__Hexdig +@ thiscall -arch=win32 ?_Hexdig@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABEHGGGG(a)Z(ptr long long long long) MSVCP_num_get_wchar__Hexdig @ cdecl -arch=win64 ?_Hexdig@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@AEBAHGGGG(a)Z(ptr long long long long) MSVCP_num_get_wchar__Hexdig @ thiscall -arch=win32 ?_Hexdig@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABEH_W000(a)Z(ptr long long long long) MSVCP_num_get_wchar__Hexdig @ cdecl -arch=win64 ?_Hexdig@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBAH_W000(a)Z(ptr long long long long) MSVCP_num_get_wchar__Hexdig @@ -4055,7 +4055,7 @@ @ cdecl -arch=win64 ?get@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHAEA_K(a)Z(ptr ptr ptr ptr ptr ptr ptr) num_get_char_get_uint64 @ thiscall -arch=win32 ?get@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHAA_N(a)Z(ptr ptr ptr long ptr long ptr ptr ptr) num_get_char_get_bool @ cdecl -arch=win64 ?get@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHAEA_N(a)Z(ptr ptr ptr ptr ptr ptr ptr) num_get_char_get_bool -@ thiscall -arch=win32 ?get@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@0AAVios_base(a)2@AAHAAG@(ptr ptr ptr long ptr long ptr ptr ptr) num_get_wchar_get_ushort +@ thiscall -arch=win32 ?get@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@0AAVios_base(a)2@AAHAAG(a)Z(ptr ptr ptr long ptr long ptr ptr ptr) num_get_wchar_get_ushort @ cdecl -arch=win64 ?get@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@0AEAVios_base(a)2@AEAHAEAG(a)Z(ptr ptr ptr ptr ptr ptr ptr) num_get_wchar_get_ushort @ thiscall -arch=win32 ?get@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@0AAVios_base(a)2@AAHAAI(a)Z(ptr ptr ptr long ptr long ptr ptr ptr) num_get_wchar_get_uint @ cdecl -arch=win64 ?get@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@0AEAVios_base(a)2@AEAHAEAI(a)Z(ptr ptr ptr ptr ptr ptr ptr) num_get_wchar_get_uint

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 248dd82cd12b0d27c5edc04e1870ee11a7f92160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=248dd82cd12b0d27c5edc04e1… Author: Luca Bennati <lucak3(a)gmail.com> Date: Fri Jan 13 12:12:11 2012 +0100 po: Update Italian translation. --- po/it.po | 138 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 68 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=248dd82cd12b0d27c5edc…

1 0

Hans Leidekker : msi: Set the SourceDir and SOURCEDIR properties in MsiGetSourcePath.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: bc801f85be6d63714d6d25cb7c1811ab1e4b0ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc801f85be6d63714d6d25cb7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 16 11:41:11 2012 +0100 msi: Set the SourceDir and SOURCEDIR properties in MsiGetSourcePath. --- dlls/msi/install.c | 16 +++------ dlls/msi/tests/package.c | 77 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 72 insertions(+), 21 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 86e3979..2428ef5 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -347,16 +347,10 @@ UINT WINAPI MsiGetTargetPathW( MSIHANDLE hInstall, LPCWSTR szFolder, return MSI_GetTargetPath( hInstall, szFolder, &path, pcchPathBuf ); } -static WCHAR *get_source_root( MSIDATABASE *db ) +static WCHAR *get_source_root( MSIPACKAGE *package ) { - WCHAR *path, *p; - - if ((path = msi_dup_property( db, szSourceDir ))) return path; - if ((path = msi_dup_property( db, szDatabase ))) - { - if ((p = strrchrW( path, '\\' ))) p[1] = 0; - } - return path; + msi_set_sourcedir_props( package, FALSE ); + return msi_dup_property( package->db, szSourceDir ); } WCHAR *msi_resolve_source_folder( MSIPACKAGE *package, const WCHAR *name, MSIFOLDER **folder ) @@ -372,7 +366,7 @@ WCHAR *msi_resolve_source_folder( MSIPACKAGE *package, const WCHAR *name, MSIFOL /* special resolving for root dir */ if (!strcmpW( name, szTargetDir ) && !f->ResolvedSource) { - f->ResolvedSource = get_source_root( package->db ); + f->ResolvedSource = get_source_root( package ); } if (folder) *folder = f; if (f->ResolvedSource) @@ -388,7 +382,7 @@ WCHAR *msi_resolve_source_folder( MSIPACKAGE *package, const WCHAR *name, MSIFOL p = msi_resolve_source_folder( package, parent, NULL ); if (package->WordCount & msidbSumInfoSourceTypeCompressed) - path = get_source_root( package->db ); + path = get_source_root( package ); else if (package->WordCount & msidbSumInfoSourceTypeSFN) path = msi_build_directory_name( 3, p, f->SourceShortPath, NULL ); else diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9fae1d9..34d5eff 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -10972,13 +10972,17 @@ static void test_MsiGetSourcePath(void) /* source path does not exist, but the property exists */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(hpkg, "SourceDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(hpkg, "SOURCEDIR", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); - ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); - } + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); /* try SubDir after CostInitialize */ size = MAX_PATH; @@ -11027,6 +11031,13 @@ static void test_MsiGetSourcePath(void) /* source path does not exist, but the property exists */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(hpkg, "SourceDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(hpkg, "SOURCEDIR", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); @@ -11079,6 +11090,13 @@ static void test_MsiGetSourcePath(void) /* source path does not exist, but the property exists */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(hpkg, "SourceDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(hpkg, "SOURCEDIR", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); @@ -11131,6 +11149,13 @@ static void test_MsiGetSourcePath(void) /* source path does not exist, but the property exists */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(hpkg, "SourceDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(hpkg, "SOURCEDIR", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); @@ -11268,6 +11293,13 @@ static void test_MsiGetSourcePath(void) /* source path nor the property exist */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(hpkg, "SourceDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path); + ok(size == 0, "Expected 0, got %d\n", size); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(hpkg, "SOURCEDIR", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path); @@ -11324,13 +11356,17 @@ static void test_MsiGetSourcePath(void) /* source path does not exist, but the property exists */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(hpkg, "SourceDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(hpkg, "SOURCEDIR", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); - ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); - } + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); /* try SubDir after CostInitialize */ size = MAX_PATH; @@ -11381,6 +11417,13 @@ static void test_MsiGetSourcePath(void) /* source path and the property exist */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(hpkg, "SourceDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(hpkg, "SOURCEDIR", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); @@ -11435,6 +11478,13 @@ static void test_MsiGetSourcePath(void) /* source path and the property exist */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(hpkg, "SourceDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(hpkg, "SOURCEDIR", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); @@ -11489,6 +11539,13 @@ static void test_MsiGetSourcePath(void) /* source path and the property exist */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(hpkg, "SourceDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(hpkg, "SOURCEDIR", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path);

1 0

Michael Stefaniuc : dsound: Merge IDirectSound3DListener into the primary buffer object.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 37df4671cb7acc214fd1e5bb5f2fc4ecb0015a48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37df4671cb7acc214fd1e5bb5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 16 00:13:31 2012 +0100 dsound: Merge IDirectSound3DListener into the primary buffer object. --- dlls/dsound/dsound_private.h | 22 +---- dlls/dsound/primary.c | 36 +++++-- dlls/dsound/sound3d.c | 236 +++++++++++++++--------------------------- 3 files changed, 111 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37df4671cb7acc214fd1e…

1 0

Francois Gouget : dbghelp: Fix the position where the calling convention is specified in function pointers .
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 67448e566176dadc53091da304c89d8c29093f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=67448e566176dadc53091da30… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jan 15 21:09:02 2012 +0100 dbghelp: Fix the position where the calling convention is specified in function pointers. --- dlls/dbghelp/symbol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 6c5aebf..ac1824b 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1853,7 +1853,7 @@ DWORD WINAPI UnDecorateSymbolName(PCSTR DecoratedName, PSTR UnDecoratedName, DWORD UndecoratedLength, DWORD Flags) { /* undocumented from msvcrt */ - static char* (* CDECL p_undname)(char*, const char*, int, void* (* CDECL)(size_t), void (* CDECL)(void*), unsigned short); + static char* (CDECL *p_undname)(char*, const char*, int, void* (CDECL*)(size_t), void (CDECL*)(void*), unsigned short); static const WCHAR szMsvcrt[] = {'m','s','v','c','r','t','.','d','l','l',0}; TRACE("(%s, %p, %d, 0x%08x)\n",

1 0

Michael Stefaniuc : mscoree: Remove superfluous NULL pointer checks before free (Smatch).
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: bf5e5a981e0e0f2afd3c0da4f8931481ab86268e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5e5a981e0e0f2afd3c0da4f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 16 00:17:31 2012 +0100 mscoree: Remove superfluous NULL pointer checks before free (Smatch). --- dlls/mscoree/corruntimehost.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 5042f20..00966ee 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -609,14 +609,10 @@ static HRESULT WINAPI CLRRuntimeHost_ExecuteInDefaultAppDomain(ICLRRuntimeHost* } cleanup: - if(filenameA) - HeapFree(GetProcessHeap(), 0, filenameA); - if(classA) - HeapFree(GetProcessHeap(), 0, classA); - if(argsA) - HeapFree(GetProcessHeap(), 0, argsA); - if(methodA) - HeapFree(GetProcessHeap(), 0, methodA); + HeapFree(GetProcessHeap(), 0, filenameA); + HeapFree(GetProcessHeap(), 0, classA); + HeapFree(GetProcessHeap(), 0, argsA); + HeapFree(GetProcessHeap(), 0, methodA); return hr; }

1 0

Francois Gouget : wined3d: Add a trailing '\n' to a FIXME() message.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: cbc7a0361ea3cddafe404e23fb9ba9f322a0712f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbc7a0361ea3cddafe404e23f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 16 00:54:05 2012 +0100 wined3d: Add a trailing '\n' to a FIXME() message. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 84d757b..f0edb92 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5681,7 +5681,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co /* Nothing to do */ break; default: - FIXME("Unhandled location %#x", location); + FIXME("Unhandled location %#x\n", location); } surface->flags &= ~SFLAG_LOST; surface->flags |= location;

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/source /git/website
by Jeremy Newman Jan. 16, 2012

Jan. 16, 2012

Module: website Branch: master Commit: d1e1be8e364c94f915f78cdc3a903294e95b92fa URL: http://source.winehq.org/git/website.git/?a=commit;h=d1e1be8e364c94f915f78c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jan 16 09:13:27 2012 -0600 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0