February 2007 - Wine-Commits

Jacek Caban : itss: Added test of paths with back slashes and escaped URLs.
by Alexandre Julliard Feb. 23, 2007

Feb. 23, 2007

Module: wine Branch: master Commit: 09cf4e5dcc01ebd33fe8ae13e177505c62b8e856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09cf4e5dcc01ebd33fe8ae13e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 22 21:10:08 2007 +0100 itss: Added test of paths with back slashes and escaped URLs. --- dlls/itss/tests/protocol.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index f04f162..c9f7e95 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -73,6 +73,12 @@ static enum { MK_PROTOCOL } test_protocol; +static const WCHAR cache_file1[] = + {'t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; +static const WCHAR cache_file2[] = + {'t','e','s','t','.','c','h','m',':',':','\\','b','l','a','n','k','.','h','t','m','l',0}; +static const WCHAR *cache_file = cache_file1; + static HRESULT WINAPI ProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocolSink, riid)) { @@ -103,8 +109,6 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, { static const WCHAR blank_html[] = {'b','l','a','n','k','.','h','t','m','l',0}; static const WCHAR text_html[] = {'t','e','x','t','/','h','t','m','l',0}; - static const WCHAR cache_file[] = - {'t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; switch(ulStatusCode) { case BINDSTATUS_BEGINDOWNLOADDATA: @@ -391,6 +395,7 @@ static void test_protocol_url(IClassFactory *factory, LPCWSTR url) static void test_its_protocol(void) { + IInternetProtocolInfo *info; IClassFactory *factory; IUnknown *unk; ULONG ref; @@ -404,6 +409,10 @@ static void test_its_protocol(void) 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; static const WCHAR blank_url4[] = {'i','t','s',':', 't','e','s','t','.','c','h','m',':',':','b','l','a','n','k','.','h','t','m','l',0}; + static const WCHAR blank_url5[] = {'i','t','s',':', + 't','e','s','t','.','c','h','m',':',':','\\','b','l','a','n','k','.','h','t','m','l',0}; + static const WCHAR blank_url6[] = {'i','t','s',':', + 't','e','s','t','.','c','h','m',':',':','/','%','6','2','l','a','n','k','.','h','t','m','l',0}; static const WCHAR wrong_url1[] = {'i','t','s',':','t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','.','h','t','m','l',0}; static const WCHAR wrong_url2[] = @@ -422,6 +431,9 @@ static void test_its_protocol(void) if(!SUCCEEDED(hres)) return; + hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&info); + ok(hres == E_NOINTERFACE, "Could not get IInternetProtocolInfo: %08x\n", hres); + hres = IUnknown_QueryInterface(unk, &IID_IClassFactory, (void**)&factory); ok(hres == S_OK, "Could not get IClassFactory interface\n"); if(SUCCEEDED(hres)) { @@ -449,6 +461,8 @@ static void test_its_protocol(void) test_protocol_url(factory, blank_url2); test_protocol_url(factory, blank_url3); test_protocol_url(factory, blank_url4); + test_protocol_url(factory, blank_url5); + test_protocol_url(factory, blank_url6); } IClassFactory_Release(factory); @@ -462,8 +476,10 @@ static void test_mk_protocol(void) IClassFactory *cf; HRESULT hres; - static const WCHAR blank_url[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', + static const WCHAR blank_url1[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; + static const WCHAR blank_url2[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', + 't','e','s','t','.','c','h','m',':',':','\\','b','l','a','n','k','.','h','t','m','l',0}; test_protocol = MK_PROTOCOL; @@ -473,7 +489,10 @@ static void test_mk_protocol(void) if(!SUCCEEDED(hres)) return; - test_protocol_url(cf, blank_url); + cache_file = cache_file1; + test_protocol_url(cf, blank_url1); + cache_file = cache_file2; + test_protocol_url(cf, blank_url2); IClassFactory_Release(cf); }

1 0

Jacek Caban : itss: Fix handling URLs with back slashes and escaped URLs.
by Alexandre Julliard Feb. 23, 2007

Feb. 23, 2007

Module: wine Branch: master Commit: 2cc9eb166528c85746ee6f1c57239ad0156b4481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc9eb166528c85746ee6f1c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 22 21:09:31 2007 +0100 itss: Fix handling URLs with back slashes and escaped URLs. --- dlls/itss/Makefile.in | 2 +- dlls/itss/protocol.c | 58 +++++++++++++++++++++++++++++++++---------------- 2 files changed, 40 insertions(+), 20 deletions(-) diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in index ccde6c2..1a07a66 100644 --- a/dlls/itss/Makefile.in +++ b/dlls/itss/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = itss.dll -IMPORTS = urlmon ole32 user32 advapi32 kernel32 ntdll +IMPORTS = urlmon shlwapi ole32 user32 advapi32 kernel32 ntdll EXTRALIBS = -luuid EXTRADEFS = -DCOM_NO_WINDOWS_H diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index fe7e3c8..357476d 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -23,8 +23,10 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "winreg.h" #include "ole2.h" #include "urlmon.h" +#include "shlwapi.h" #include "itsstor.h" #include "chm_lib.h" @@ -135,8 +137,8 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ITSProtocol *This = PROTOCOL_THIS(iface); BINDINFO bindinfo; DWORD bindf = 0, len; - LPWSTR file_name, mime; - LPCWSTR object_name, path; + LPWSTR file_name, mime, object_name, p; + LPCWSTR ptr; struct chmFile *chm_file; struct chmUnitInfo chm_object; int res; @@ -147,8 +149,8 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); - path = skip_schema(szUrl); - if(!path) + ptr = skip_schema(szUrl); + if(!ptr) return INET_E_USE_DEFAULT_PROTOCOLHANDLER; memset(&bindinfo, 0, sizeof(bindinfo)); @@ -161,39 +163,57 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ReleaseBindInfo(&bindinfo); - object_name = strstrW(path, separator); - if(!object_name) { + len = strlenW(ptr)+3; + file_name = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + memcpy(file_name, ptr, len*sizeof(WCHAR)); + hres = UrlUnescapeW(file_name, NULL, &len, URL_UNESCAPE_INPLACE); + if(FAILED(hres)) { + WARN("UrlUnescape failed: %08x\n", hres); + HeapFree(GetProcessHeap(), 0, file_name); + return hres; + } + + p = strstrW(file_name, separator); + if(!p) { WARN("invalid url\n"); + HeapFree(GetProcessHeap(), 0, file_name); return report_result(pOIProtSink, STG_E_FILENOTFOUND); } - len = object_name-path; - file_name = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)); - memcpy(file_name, path, len*sizeof(WCHAR)); - file_name[len] = 0; + *p = 0; chm_file = chm_openW(file_name); if(!chm_file) { WARN("Could not open chm file\n"); + HeapFree(GetProcessHeap(), 0, file_name); return report_result(pOIProtSink, STG_E_FILENOTFOUND); } - object_name += 2; + object_name = p+2; + if(*object_name != '/' && *object_name != '\\') { + int len = strlenW(object_name)+1; + memmove(object_name+1, object_name, len*sizeof(WCHAR)); + *object_name = '/'; + } + + for(p=object_name; *p; p++) { + if(*p == '\\') + *p = '/'; + } + + TRACE("Resolving %s\n", debugstr_w(object_name)); + memset(&chm_object, 0, sizeof(chm_object)); res = chm_resolve_object(chm_file, object_name, &chm_object); - if(res != CHM_RESOLVE_SUCCESS && object_name[0] != '/') { - WCHAR tmp_obj_name[MAX_PATH]; - tmp_obj_name[0] = '/'; - strcpyW(tmp_obj_name+1, object_name); - res = chm_resolve_object(chm_file, tmp_obj_name, &chm_object); - } if(res != CHM_RESOLVE_SUCCESS) { WARN("Could not resolve chm object\n"); + HeapFree(GetProcessHeap(), 0, object_name); chm_close(chm_file); return report_result(pOIProtSink, STG_E_FILENOTFOUND); } IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, - object_name[0] == '/' ? object_name+1 : object_name); + strrchrW(object_name, '/')+1); + HeapFree(GetProcessHeap(), 0, file_name); /* FIXME: Native doesn't use FindMimeFromData */ hres = FindMimeFromData(NULL, szUrl, NULL, 0, NULL, 0, &mime, 0); @@ -211,7 +231,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, chm_object.length, chm_object.length); if(FAILED(hres)) { WARN("ReportData failed: %08x\n", hres); - chm_close(chm_file); + release_chm(This); return report_result(pOIProtSink, hres); }

1 0

Jacek Caban : itss: Fix opening streams with back slashes.
by Alexandre Julliard Feb. 23, 2007

Feb. 23, 2007

Module: wine Branch: master Commit: 18632c2b3c13d5b369051a919151b40dbcd25f91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18632c2b3c13d5b369051a919… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 22 21:08:47 2007 +0100 itss: Fix opening streams with back slashes. --- dlls/itss/storage.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index 6c163ad..c3c144c 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -329,7 +329,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStream( DWORD len; struct chmUnitInfo ui; int r; - WCHAR *path; + WCHAR *path, *p; TRACE("%p %s %p %u %u %p\n", This, debugstr_w(pwcsName), reserved1, grfMode, reserved2, ppstm ); @@ -337,21 +337,29 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStream( len = strlenW( This->dir ) + strlenW( pwcsName ) + 1; path = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); strcpyW( path, This->dir ); - if( pwcsName[0] == '/' ) + + if( pwcsName[0] == '/' || pwcsName[0] == '\\' ) { - WCHAR *p = &path[strlenW( path ) - 1]; + p = &path[strlenW( path ) - 1]; while( ( path <= p ) && ( *p == '/' ) ) *p-- = 0; } strcatW( path, pwcsName ); + for(p=path; *p; p++) { + if(*p == '\\') + *p = '/'; + } + TRACE("Resolving %s\n", debugstr_w(path)); r = chm_resolve_object(This->chmfile, path, &ui); HeapFree( GetProcessHeap(), 0, path ); - if( r != CHM_RESOLVE_SUCCESS ) + if( r != CHM_RESOLVE_SUCCESS ) { + WARN("Could not resolve object\n"); return STG_E_FILENOTFOUND; + } stm = ITSS_create_stream( This, &ui ); if( !stm ) @@ -660,7 +668,7 @@ static HRESULT WINAPI ITSS_IStream_Read( This->addr += count; if( pcbRead ) *pcbRead = count; - + return count ? S_OK : S_FALSE; }

1 0

Dmitry Timoshkov : gdi32: Avoid a not necessary CreateDC call.
by Alexandre Julliard Feb. 23, 2007

Feb. 23, 2007

Module: wine Branch: master Commit: aa3fa9a5d955c48b2784a6b1d0f24f1834a52a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa3fa9a5d955c48b2784a6b1d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 22 18:43:13 2007 +0800 gdi32: Avoid a not necessary CreateDC call. --- dlls/gdi32/wing.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/wing.c b/dlls/gdi32/wing.c index 7550fe2..b821ad3 100644 --- a/dlls/gdi32/wing.c +++ b/dlls/gdi32/wing.c @@ -96,13 +96,11 @@ HDC16 WINAPI WinGCreateDC16(void) */ BOOL16 WINAPI WinGRecommendDIBFormat16(BITMAPINFO *bmpi) { - static const WCHAR szDisplayW[] = { 'D','I','S','P','L','A','Y','\0' }; - HDC hdc; TRACE("(%p)\n", bmpi); + if (!bmpi) return FALSE; - hdc = CreateDCW( szDisplayW, NULL, NULL, NULL ); bmpi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); bmpi->bmiHeader.biWidth = 320; bmpi->bmiHeader.biHeight = -1; @@ -114,7 +112,7 @@ BOOL16 WINAPI WinGRecommendDIBFormat16(BITMAPINFO *bmpi) bmpi->bmiHeader.biYPelsPerMeter = 0; bmpi->bmiHeader.biClrUsed = 0; bmpi->bmiHeader.biClrImportant = 0; - DeleteDC(hdc); + return TRUE; }

1 0

Rob Shearman : kernel32: Fix crash in dns_gethostbyname.
by Alexandre Julliard Feb. 23, 2007

Feb. 23, 2007

Module: wine Branch: master Commit: e716c5b1ef8674e24205eb85c4d85880f20e3c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e716c5b1ef8674e24205eb85c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 22 14:35:31 2007 +0000 kernel32: Fix crash in dns_gethostbyname. --- dlls/kernel32/computername.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index eebaed7..db9799a 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -89,9 +89,14 @@ static BOOL dns_gethostbyname ( char *name, int *size ) ebufsize *= 2; extrabuf = HeapReAlloc( GetProcessHeap(), 0, extrabuf, ebufsize ) ; } - + if ( res ) WARN ("Error in gethostbyname_r %d (%d)\n", res, locerr); + else if ( !host ) + { + WARN ("gethostbyname_r returned NULL host, locerr = %d\n", locerr); + res = 1; + } else { int len = strlen ( host->h_name );

1 0

Dmitry Timoshkov : dlls: Add wing32 dll.
by Alexandre Julliard Feb. 23, 2007

Feb. 23, 2007

Module: wine Branch: master Commit: 47e6fb4d299b139fcac72e704c6200efc246d85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47e6fb4d299b139fcac72e704… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 22 18:43:58 2007 +0800 dlls: Add wing32 dll. --- Makefile.in | 2 + configure | 3 +- configure.ac | 1 + dlls/Makefile.in | 1 + dlls/wing32/Makefile.in | 12 ++++ dlls/wing32/wing32.c | 143 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wing32/wing32.spec | 10 +++ 7 files changed, 171 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47e6fb4d299b139fcac72…

1 0

Rob Shearman : netapi32: Add a stub for NetUserChangePassword.
by Alexandre Julliard Feb. 23, 2007

Feb. 23, 2007

Module: wine Branch: master Commit: 3d02585449bfa2fda1adb161f8bc63eace2239ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d02585449bfa2fda1adb161f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 22 14:34:10 2007 +0000 netapi32: Add a stub for NetUserChangePassword. --- dlls/netapi32/access.c | 22 ++++++++++++++++++++++ dlls/netapi32/netapi32.spec | 2 +- 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 7861140..94d8b23 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -701,3 +701,25 @@ NET_API_STATUS WINAPI NetUserModalsGet( return NERR_Success; } + +/****************************************************************************** + * NetUserChangePassword (NETAPI32.@) + * PARAMS + * domainname [I] Optional. Domain on which the user resides or the logon + * domain of the current user if NULL. + * username [I] Optional. Username to change the password for or the name + * of the current user if NULL. + * oldpassword [I] The user's current password. + * newpassword [I] The password that the user will be changed to using. + * + * RETURNS + * Success: NERR_Success. + * Failure: NERR_* failure code or win error code. + * + */ +NET_API_STATUS WINAPI NetUserChangePassword(LPCWSTR domainname, LPCWSTR username, + LPCWSTR oldpassword, LPCWSTR newpassword) +{ + FIXME("(%s, %s, ..., ...)\n", debugstr_w(domainname), debugstr_w(username)); + return NERR_InternalError; +} diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 65bdba4..b0d6ebf 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -202,7 +202,7 @@ @ stub NetUseEnum @ stub NetUseGetInfo @ stdcall NetUserAdd(wstr long ptr ptr) -@ stub NetUserChangePassword +@ stdcall NetUserChangePassword(wstr wstr wstr wstr) @ stdcall NetUserDel(wstr wstr) @ stdcall NetUserEnum(wstr long long ptr long ptr ptr ptr) @ stub NetUserGetGroups

1 0

Francois Gouget : wine.inf: Fix the 'Pacific Standard Time' display name to match the CLDR.
by Alexandre Julliard Feb. 23, 2007

Feb. 23, 2007

Module: wine Branch: master Commit: 826f89f5a77e8232b28a7c6a260546adbe02368d URL: http://source.winehq.org/git/wine.git/?a=commit;h=826f89f5a77e8232b28a7c6a2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 22 11:21:21 2007 +0100 wine.inf: Fix the 'Pacific Standard Time' display name to match the CLDR. This also removes the ambiguity with the new 'Pacific Standard Time (Mexico)' timezone. --- tools/wine.inf | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 34f2370..7127629 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2249,11 +2249,11 @@ HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"Display",,"America/Anc HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"Dlt",,"Alaskan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"Std",,"Alaskan Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"TZI",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Display",,"Pacific Standard Time (US)" +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Display",,"America/Los_Angeles" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Dlt",,"Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Std",,"Pacific Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Display",,"America/Tijuana (Pacific Standard Time)" +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Display",,"America/Tijuana" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Dlt",,"Pacific Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Std",,"Pacific Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00

1 0

Francois Gouget : Use the SW_XXX constants when calling ShowWindow().
by Alexandre Julliard Feb. 23, 2007

Feb. 23, 2007

Module: wine Branch: master Commit: 396bad1f6ed070bf98b8074b3cfcf8664c7dfa9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=396bad1f6ed070bf98b8074b3… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 22 11:20:35 2007 +0100 Use the SW_XXX constants when calling ShowWindow(). --- dlls/shlwapi/msgbox.c | 10 +++++----- dlls/wined3d/device.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/msgbox.c b/dlls/shlwapi/msgbox.c index 5e8c063..0e3c517 100644 --- a/dlls/shlwapi/msgbox.c +++ b/dlls/shlwapi/msgbox.c @@ -204,15 +204,15 @@ static INT_PTR CALLBACK SHDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lP switch (d->dwType) { case 0: - ShowWindow(GetDlgItem(hDlg, IDCANCEL), FALSE); + ShowWindow(GetDlgItem(hDlg, IDCANCEL), SW_HIDE); /* FIXME: Move OK button to position of the Cancel button (cosmetic) */ case 1: - ShowWindow(GetDlgItem(hDlg, IDYES), FALSE); - ShowWindow(GetDlgItem(hDlg, IDNO), FALSE); + ShowWindow(GetDlgItem(hDlg, IDYES), SW_HIDE); + ShowWindow(GetDlgItem(hDlg, IDNO), SW_HIDE); break; default: - ShowWindow(GetDlgItem(hDlg, IDOK), FALSE); - ShowWindow(GetDlgItem(hDlg, IDCANCEL), FALSE); + ShowWindow(GetDlgItem(hDlg, IDOK), SW_HIDE); + ShowWindow(GetDlgItem(hDlg, IDCANCEL), SW_HIDE); break; } return TRUE; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 82873c6..b1e9c2d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1250,7 +1250,7 @@ static void WINAPI IWineD3DDeviceImpl_SetupFullscreenWindow(IWineD3DDevice *ifac /* Inform the window about the update. */ SetWindowPos(window, HWND_TOP, 0, 0, This->ddraw_width, This->ddraw_height, SWP_FRAMECHANGED); - ShowWindow(window, TRUE); + ShowWindow(window, SW_NORMAL); } /*****************************************************************************

1 0

Eric Pouech : dbghelp: Merge the A/W of elf_map_file into a single one.
by Alexandre Julliard Feb. 22, 2007

Feb. 22, 2007

Module: wine Branch: master Commit: 8d3167cc9af378f48a5d6198b466d73f9695cd0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d3167cc9af378f48a5d6198b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 21 21:56:42 2007 +0100 dbghelp: Merge the A/W of elf_map_file into a single one. --- dlls/dbghelp/elf_module.c | 33 ++++++++++++++------------------- 1 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 092dbc9..7758199 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -192,33 +192,39 @@ static inline unsigned elf_get_map_size(struct elf_file_map* fmap, int sidx) * * Maps an ELF file into memory (and checks it's a real ELF file) */ -static BOOL elf_map_fileA(const char* filename, struct elf_file_map* fmap) +static BOOL elf_map_file(const WCHAR* filenameW, struct elf_file_map* fmap) { static const BYTE elf_signature[4] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3 }; struct stat statbuf; int i; Elf32_Phdr phdr; unsigned tmp, page_mask = getpagesize() - 1; + char* filename; + unsigned len; + BOOL ret = FALSE; + len = WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, NULL, 0, NULL, NULL); + if (!(filename = HeapAlloc(GetProcessHeap(), 0, len))) return FALSE; + WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, filename, len, NULL, NULL); fmap->fd = -1; fmap->with_crc = 0; /* check that the file exists, and that the module hasn't been loaded yet */ - if (stat(filename, &statbuf) == -1 || S_ISDIR(statbuf.st_mode)) return FALSE; + if (stat(filename, &statbuf) == -1 || S_ISDIR(statbuf.st_mode)) goto done; /* Now open the file, so that we can mmap() it. */ - if ((fmap->fd = open(filename, O_RDONLY)) == -1) return FALSE; + if ((fmap->fd = open(filename, O_RDONLY)) == -1) goto done; if (read(fmap->fd, &fmap->elfhdr, sizeof(fmap->elfhdr)) != sizeof(fmap->elfhdr)) - return FALSE; + goto done; /* and check for an ELF header */ if (memcmp(fmap->elfhdr.e_ident, - elf_signature, sizeof(elf_signature))) return FALSE; + elf_signature, sizeof(elf_signature))) goto done; fmap->sect = HeapAlloc(GetProcessHeap(), 0, fmap->elfhdr.e_shnum * sizeof(fmap->sect[0])); - if (!fmap->sect) return FALSE; + if (!fmap->sect) goto done; lseek(fmap->fd, fmap->elfhdr.e_shoff, SEEK_SET); for (i = 0; i < fmap->elfhdr.e_shnum; i++) @@ -245,19 +251,8 @@ static BOOL elf_map_fileA(const char* filename, struct elf_file_map* fmap) * otherwise, all addresses are zero based and start has no effect */ fmap->elf_size -= fmap->elf_start; - return TRUE; -} - -static BOOL elf_map_file(const WCHAR* filenameW, struct elf_file_map* fmap) -{ - char* filename; - unsigned len; - BOOL ret; - - len = WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, NULL, 0, NULL, NULL); - if (!(filename = HeapAlloc(GetProcessHeap(), 0, len))) return FALSE; - WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, filename, len, NULL, NULL); - ret = elf_map_fileA(filename, fmap); + ret = TRUE; +done: HeapFree(GetProcessHeap(), 0, filename); return ret; }

1 0