February 2008 - Wine-commits

Jacek Caban : wininet: Added beginning support for HTTP cache files.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: d7a49e81470cf7c50cb8eddeb38c29aedccd79a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a49e81470cf7c50cb8eddeb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 13 13:32:49 2008 +0100 wininet: Added beginning support for HTTP cache files. --- dlls/wininet/http.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wininet/internet.c | 9 ++++++++ dlls/wininet/internet.h | 2 + 3 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 964140e..d718eea 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2283,6 +2283,20 @@ BOOL WINAPI HttpSendRequestA(HINTERNET hHttpRequest, LPCSTR lpszHeaders, return result; } +static BOOL HTTP_GetRequestURL(WININETHTTPREQW *req, LPWSTR buf) +{ + LPHTTPHEADERW host_header; + + static const WCHAR formatW[] = {'h','t','t','p',':','/','/','%','s','%','s',0}; + + host_header = HTTP_GetHeader(req, szHost); + if(!host_header) + return FALSE; + + sprintfW(buf, formatW, host_header->lpszValue, req->lpszPath); /* FIXME */ + return TRUE; +} + /*********************************************************************** * HTTP_HandleRedirect (internal) */ @@ -2743,6 +2757,32 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, } while (loop_next); + /* FIXME: Better check, when we have to create the cache file */ + if(bSuccess && (lpwhr->hdr.dwFlags & INTERNET_FLAG_NEED_FILE)) { + WCHAR url[INTERNET_MAX_URL_LENGTH]; + WCHAR cacheFileName[MAX_PATH+1]; + BOOL b; + + b = HTTP_GetRequestURL(lpwhr, url); + if(!b) { + WARN("Could not get URL\n"); + goto lend; + } + + b = CreateUrlCacheEntryW(url, lpwhr->dwContentLength > 0 ? lpwhr->dwContentLength : 0, NULL, cacheFileName, 0); + if(b) { + lpwhr->lpszCacheFile = WININET_strdupW(cacheFileName); + lpwhr->hCacheFile = CreateFileW(lpwhr->lpszCacheFile, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if(lpwhr->hCacheFile == INVALID_HANDLE_VALUE) { + WARN("Could not create file: %u\n", GetLastError()); + lpwhr->hCacheFile = NULL; + } + }else { + WARN("Could not create cache entry: %08x\n", GetLastError()); + } + } + lend: HeapFree(GetProcessHeap(), 0, requestString); @@ -3393,6 +3433,14 @@ static void HTTP_CloseHTTPRequestHandle(LPWININETHANDLEHEADER hdr) TRACE("\n"); + if(lpwhr->hCacheFile) + CloseHandle(lpwhr->hCacheFile); + + if(lpwhr->lpszCacheFile) { + DeleteFileW(lpwhr->lpszCacheFile); /* FIXME */ + HeapFree(GetProcessHeap(), 0, lpwhr->lpszCacheFile); + } + WININET_Release(&lpwhr->lpHttpSession->hdr); HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 595a718..7f422da 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1775,6 +1775,15 @@ BOOL INTERNET_ReadFile(LPWININETHANDLEHEADER lpwh, LPVOID lpBuffer, { lpwhr->dwContentRead += bytes_read; *pdwNumOfBytesRead = bytes_read; + + if(lpwhr->lpszCacheFile) { + BOOL res; + + res = WriteFile(lpwhr->hCacheFile, lpBuffer, bytes_read, NULL, NULL); + if(!res) + WARN("WriteFile failed: %u\n", GetLastError()); + } + if (!bytes_read && (lpwhr->dwContentRead == lpwhr->dwContentLength)) retval = HTTP_FinishedReading(lpwhr); else diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 0f283e1..b80de88 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -209,6 +209,8 @@ typedef struct DWORD dwContentRead; /* bytes of the content read so far */ HTTPHEADERW *pCustHeaders; DWORD nCustHeaders; + HANDLE hCacheFile; + LPWSTR lpszCacheFile; struct HttpAuthInfo *pAuthInfo; struct HttpAuthInfo *pProxyAuthInfo; } WININETHTTPREQW, *LPWININETHTTPREQW;

1 0

Francois Gouget : kernel32/tests: Fix the time tests when ' Automatically adjust clock for daylight saving changes' has been unset.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 148061814cec0efdc828b09eed6b447d6776174d URL: http://source.winehq.org/git/wine.git/?a=commit;h=148061814cec0efdc828b09ee… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 13 21:48:05 2008 +0100 kernel32/tests: Fix the time tests when 'Automatically adjust clock for daylight saving changes' has been unset. --- dlls/kernel32/tests/time.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 78d5386..73aae4d 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -207,7 +207,9 @@ static LONG get_tz_bias(const TIME_ZONE_INFORMATION *tzinfo, DWORD tz_id) switch (tz_id) { case TIME_ZONE_ID_DAYLIGHT: - return tzinfo->DaylightBias; + if (memcmp(&tzinfo->StandardDate, &tzinfo->DaylightDate, sizeof(tzinfo->DaylightDate)) != 0) + return tzinfo->DaylightBias; + /* fall through */ case TIME_ZONE_ID_STANDARD: return tzinfo->StandardBias;

1 0

Francois Gouget : mscms: [GS]etColorSpace() are not supposed to be defined in icm.h.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 93a9835da1c9bf87da7b6ed6f9f63c834d1e8014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a9835da1c9bf87da7b6ed6f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 13 21:52:09 2008 +0100 mscms: [GS]etColorSpace() are not supposed to be defined in icm.h. --- include/icm.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/include/icm.h b/include/icm.h index 14c10c8..a08d045 100644 --- a/include/icm.h +++ b/include/icm.h @@ -359,7 +359,6 @@ BOOL WINAPI GetColorProfileElement(HPROFILE,TAGTYPE,DWORD,PDWORD,PVOID,PBO BOOL WINAPI GetColorProfileElementTag(HPROFILE,DWORD,PTAGTYPE); BOOL WINAPI GetColorProfileFromHandle(HPROFILE,PBYTE,PDWORD); BOOL WINAPI GetColorProfileHeader(HPROFILE,PPROFILEHEADER); -HCOLORSPACE WINAPI GetColorSpace(HDC); BOOL WINAPI GetCountColorProfileElements(HPROFILE,PDWORD); BOOL WINAPI GetNamedProfileInfo(HPROFILE,PNAMED_PROFILE_INFO); BOOL WINAPI GetPS2ColorRenderingDictionary(HPROFILE,DWORD,PBYTE,PDWORD,PBOOL); @@ -384,7 +383,6 @@ BOOL WINAPI SetColorProfileElement(HPROFILE,TAGTYPE,DWORD,PDWORD,PVOID); BOOL WINAPI SetColorProfileElementReference(HPROFILE,TAGTYPE,TAGTYPE); BOOL WINAPI SetColorProfileElementSize(HPROFILE,TAGTYPE,DWORD); BOOL WINAPI SetColorProfileHeader(HPROFILE,PPROFILEHEADER); -HCOLORSPACE WINAPI SetColorSpace(HDC,HCOLORSPACE); BOOL WINAPI SetStandardColorSpaceProfileA(PCSTR,DWORD,PSTR); BOOL WINAPI SetStandardColorSpaceProfileW(PCWSTR,DWORD,PWSTR); #define SetStandardColorSpaceProfile WINELIB_NAME_AW(SetStandardColorSpaceProfile)

1 0

Rob Shearman : ntdll: Add an exception handler around calls to module entry points.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 0d9e09d8bf48c3297d1e8d460651deb3bf0e5bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d9e09d8bf48c3297d1e8d460… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 13 12:36:13 2008 +0000 ntdll: Add an exception handler around calls to module entry points. Change the return value from BOOL to NTSTATUS so that we can return the exception code to the caller. --- dlls/ntdll/loader.c | 34 +++++++++++++++++++++++----------- 1 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 0fbf604..a9b8a5e 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -876,18 +876,19 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) /************************************************************************* * MODULE_InitDLL */ -static BOOL MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved ) +static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved ) { WCHAR mod_name[32]; - BOOL retv = TRUE; + NTSTATUS status = STATUS_SUCCESS; DLLENTRYPROC entry = wm->ldr.EntryPoint; void *module = wm->ldr.BaseAddress; + BOOL retv = TRUE; /* Skip calls for modules loaded with special load flags */ - if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return TRUE; + if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.BaseAddress, reason ); - if (!entry) return TRUE; + if (!entry) return STATUS_SUCCESS; if (TRACE_ON(relay)) { @@ -901,7 +902,20 @@ static BOOL MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved ) else TRACE("(%p %s,%s,%p) - CALL\n", module, debugstr_w(wm->ldr.BaseDllName.Buffer), reason_names[reason], lpReserved ); - retv = call_dll_entry_point( entry, module, reason, lpReserved ); + __TRY + { + retv = call_dll_entry_point( entry, module, reason, lpReserved ); + if (!retv) + status = STATUS_DLL_INIT_FAILED; + } + __EXCEPT(NULL) + { + if (TRACE_ON(relay)) + DPRINTF("%04x:exception in PE entry point (proc=%p,module=%p,reason=%s,res=%p)\n", + GetCurrentThreadId(), entry, module, reason_names[reason], lpReserved ); + status = GetExceptionCode(); + } + __ENDTRY /* The state of the module list may have changed due to the call to the dll. We cannot assume that this module has not been @@ -912,7 +926,7 @@ static BOOL MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved ) reason_names[reason], lpReserved, retv ); else TRACE("(%p,%s,%p) - RETURN %d\n", module, reason_names[reason], lpReserved, retv ); - return retv; + return status; } @@ -979,16 +993,14 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) { WINE_MODREF *prev = current_modref; current_modref = wm; - if (MODULE_InitDLL( wm, DLL_PROCESS_ATTACH, lpReserved )) - { + status = MODULE_InitDLL( wm, DLL_PROCESS_ATTACH, lpReserved ); + if (status == STATUS_SUCCESS) wm->ldr.Flags |= LDR_PROCESS_ATTACHED; - } else { /* point to the name so LdrInitializeThunk can print it */ last_failed_modref = wm; WARN("Initialization of %s failed\n", debugstr_w(wm->ldr.BaseDllName.Buffer)); - status = STATUS_DLL_INIT_FAILED; } current_modref = prev; } @@ -1888,7 +1900,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ if (nts != STATUS_SUCCESS) nts = load_builtin_dll( load_path, filename, 0, flags, pwm ); if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT && - !MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL )) + (MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL ) != STATUS_SUCCESS)) { /* stub-only dll, try native */ TRACE( "%s pre-attach returned FALSE, preferring native\n", debugstr_w(filename) );

1 0

Rob Shearman : msi: Add stub implementation of MsiIsProductElevatedA/W.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: e35bd050828a6e577e4aaa961375436531c1860c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35bd050828a6e577e4aaa961… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 13 18:08:07 2008 +0000 msi: Add stub implementation of MsiIsProductElevatedA/W. --- dlls/msi/msi.c | 22 ++++++++++++++++++++++ dlls/msi/msi.spec | 4 ++-- include/msi.h | 4 ++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7840a4c..486cff3 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2513,3 +2513,25 @@ UINT WINAPI MsiAdvertiseScriptA( LPCSTR szScriptFile, DWORD dwFlags, debugstr_a( szScriptFile ), dwFlags, phRegData, fRemoveItems ); return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * MsiIsProductElevatedW [MSI.@] + */ +UINT WINAPI MsiIsProductElevatedW( LPCWSTR szProduct, BOOL *pfElevated ) +{ + FIXME("%s %p - stub\n", + debugstr_w( szProduct ), pfElevated ); + *pfElevated = TRUE; + return ERROR_SUCCESS; +} + +/*********************************************************************** + * MsiIsProductElevatedA [MSI.@] + */ +UINT WINAPI MsiIsProductElevatedA( LPCSTR szProduct, BOOL *pfElevated ) +{ + FIXME("%s %p - stub\n", + debugstr_a( szProduct ), pfElevated ); + *pfElevated = TRUE; + return ERROR_SUCCESS; +} diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 2294eff..56ebfdb 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -207,8 +207,8 @@ 211 stdcall MsiSourceListAddSourceW(wstr wstr long wstr) 212 stub MsiSourceListForceResolutionA 213 stub MsiSourceListForceResolutionW -214 stub MsiIsProductElevatedA -215 stub MsiIsProductElevatedW +214 stdcall MsiIsProductElevatedA(str ptr) +215 stdcall MsiIsProductElevatedW(wstr ptr) 216 stdcall MsiGetShortcutTargetA(str ptr ptr ptr) 217 stdcall MsiGetShortcutTargetW(wstr ptr ptr ptr) 218 stdcall MsiGetFileHashA(str long ptr) diff --git a/include/msi.h b/include/msi.h index 05e5ca8..33851fc 100644 --- a/include/msi.h +++ b/include/msi.h @@ -569,6 +569,10 @@ UINT WINAPI MsiAdvertiseScriptA(LPCSTR, DWORD, PHKEY, BOOL); UINT WINAPI MsiAdvertiseScriptW(LPCWSTR, DWORD, PHKEY, BOOL); #define MsiAdvertiseScript WINELIB_NAME_AW(MsiAdvertiseScript) +UINT WINAPI MsiIsProductElevatedA(LPCSTR, BOOL *); +UINT WINAPI MsiIsProductElevatedW(LPCWSTR, BOOL *); +#define MsiIsProductElevated WINELIB_NAME_AW(MsiIsProductElevated) + /* Non Unicode */ UINT WINAPI MsiCloseHandle(MSIHANDLE); UINT WINAPI MsiCloseAllHandles(void);

1 0

Francois Gouget : UTF-8 resource files must explicitly say so with a pragma .
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: c68745c51bff62ef35c2c1d3b1f1ea61c18e3d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68745c51bff62ef35c2c1d3b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 13 21:40:47 2008 +0100 UTF-8 resource files must explicitly say so with a pragma. --- dlls/credui/credui_Es.rc | 3 +++ dlls/credui/credui_Fr.rc | 3 +++ dlls/crypt32/crypt32_Sv.rc | 3 +++ dlls/gphoto2.ds/gphoto2_Es.rc | 3 +++ dlls/localui/ui_Fr.rc | 3 +++ dlls/sane.ds/sane_Es.rc | 3 +++ programs/net/Fr.rc | 3 +++ programs/wineboot/wineboot_Es.rc | 3 +++ programs/wineboot/wineboot_Fr.rc | 3 +++ programs/write/Fr.rc | 3 +++ programs/xcopy/Fr.rc | 3 +++ 11 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui_Es.rc b/dlls/credui/credui_Es.rc index 821d8dd..7227627 100644 --- a/dlls/credui/credui_Es.rc +++ b/dlls/credui/credui_Es.rc @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -48,3 +49,5 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "Bloq Mayus está activado" IDS_CAPSLOCKON "El Bloq Mayus activado puede hacer que entre su contraseña incorrectamente.\n\nPulse la tecla Bloq Mayus de su teclado para desactivar Bloq Mayus antes\n de introducir su contraseña." } + +#pragma code_page(default) diff --git a/dlls/credui/credui_Fr.rc b/dlls/credui/credui_Fr.rc index c1d71d4..468eb1c 100644 --- a/dlls/credui/credui_Fr.rc +++ b/dlls/credui/credui_Fr.rc @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -48,3 +49,5 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "VERR.MAJ est activé" IDS_CAPSLOCKON "Le verrouillage majuscule étant activé, cela pourrait provoquer une erreur lors de la saisie de votre mot de passe.\n\nAppuyez sur la touche VERR.MAJ de votre clavier afin de désactiver le verrouilage majuscule avant\nde saisir votre mot de passe." } + +#pragma code_page(default) diff --git a/dlls/crypt32/crypt32_Sv.rc b/dlls/crypt32/crypt32_Sv.rc index 132b7b7..33167d1 100644 --- a/dlls/crypt32/crypt32_Sv.rc +++ b/dlls/crypt32/crypt32_Sv.rc @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT @@ -164,3 +165,5 @@ STRINGTABLE DISCARDABLE IDS_LIFETIME_SIGNING "Lifetime Signing" IDS_ANY_CERT_POLICY "All issuance policies" } + +#pragma code_page(default) diff --git a/dlls/gphoto2.ds/gphoto2_Es.rc b/dlls/gphoto2.ds/gphoto2_Es.rc index 2a29e9a..534c68e 100644 --- a/dlls/gphoto2.ds/gphoto2_Es.rc +++ b/dlls/gphoto2.ds/gphoto2_Es.rc @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT @@ -53,3 +54,5 @@ BEGIN LTEXT "Conectando a la cámara... Por favor espere",IDC_STATIC,128,58, 116,8 END + +#pragma code_page(default) diff --git a/dlls/localui/ui_Fr.rc b/dlls/localui/ui_Fr.rc index a838293..261fa0b 100644 --- a/dlls/localui/ui_Fr.rc +++ b/dlls/localui/ui_Fr.rc @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -52,3 +53,5 @@ STRINGTABLE DISCARDABLE IDS_PORTEXISTS "Le port %s existe déjà" IDS_NOTHINGTOCONFIG "Ce port n'a pas d'options de configuration" } + +#pragma code_page(default) diff --git a/dlls/sane.ds/sane_Es.rc b/dlls/sane.ds/sane_Es.rc index e6e0ab3..bae6b62 100644 --- a/dlls/sane.ds/sane_Es.rc +++ b/dlls/sane.ds/sane_Es.rc @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT @@ -38,3 +39,5 @@ STRINGTABLE DISCARDABLE 5 "%" 6 "ns" } + +#pragma code_page(default) diff --git a/programs/net/Fr.rc b/programs/net/Fr.rc index 83d1a6c..bca25a4 100644 --- a/programs/net/Fr.rc +++ b/programs/net/Fr.rc @@ -18,6 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -41,3 +42,5 @@ STRINGTABLE STRING_USE_HEADER, "\nStatut Local Distant\n---------------------------------------------------------------\n" STRING_USE_ENTRY, "%s %S %S Ressources ouvertes : %lu\n" } + +#pragma code_page(default) diff --git a/programs/wineboot/wineboot_Es.rc b/programs/wineboot/wineboot_Es.rc index 4af1677..229eaba 100644 --- a/programs/wineboot/wineboot_Es.rc +++ b/programs/wineboot/wineboot_Es.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ +#pragma code_page(65001) LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -33,3 +34,5 @@ BEGIN LTEXT "Si termina el programa puede perder los datos no grabados.", IDC_STATIC,7,28,172,15 END + +#pragma code_page(default) diff --git a/programs/wineboot/wineboot_Fr.rc b/programs/wineboot/wineboot_Fr.rc index cae61f6..b24c5d1 100644 --- a/programs/wineboot/wineboot_Fr.rc +++ b/programs/wineboot/wineboot_Fr.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ +#pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -33,3 +34,5 @@ BEGIN LTEXT "Si vous arrêtez le programme, vous pouvez perdre toutes les données non enregistrées.", IDC_STATIC,7,28,172,15 END + +#pragma code_page(default) diff --git a/programs/write/Fr.rc b/programs/write/Fr.rc index 452244e..0258efc 100644 --- a/programs/write/Fr.rc +++ b/programs/write/Fr.rc @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -24,3 +25,5 @@ STRINGTABLE { IDS_FAILED, "Wordpad n'a pas pu être démarré" } + +#pragma code_page(default) diff --git a/programs/xcopy/Fr.rc b/programs/xcopy/Fr.rc index 92c8311..e641e6a 100644 --- a/programs/xcopy/Fr.rc +++ b/programs/xcopy/Fr.rc @@ -18,6 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -77,3 +78,5 @@ Où :\n\ \t\tque le fichier source\n\n" } + +#pragma code_page(default)

1 0

Francois Gouget : kernel32: Add prototypes for [GS] etDynamicTimeZoneInformation().
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: bce8b677852ab07877f7b3f444dd1bb45051fd0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce8b677852ab07877f7b3f44… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 13 21:41:59 2008 +0100 kernel32: Add prototypes for [GS]etDynamicTimeZoneInformation(). --- include/winbase.h | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 2c97d4b..0011c53 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -605,6 +605,19 @@ typedef struct _PROCESS_INFORMATION{ DWORD dwThreadId; } PROCESS_INFORMATION, *PPROCESS_INFORMATION, *LPPROCESS_INFORMATION; +typedef struct _TIME_DYNAMIC_ZONE_INFORMATION +{ + LONG Bias; + WCHAR StandardName[32]; + SYSTEMTIME StandardDate; + LONG StandardBias; + WCHAR DaylightName[32]; + SYSTEMTIME DaylightDate; + LONG DaylightBias; + WCHAR TimeZoneKeyName[128]; + BOOLEAN DynamicDaylightTimeDisabled; +} DYNAMIC_TIME_ZONE_INFORMATION, *PDYNAMIC_TIME_ZONE_INFORMATION; + typedef struct _TIME_ZONE_INFORMATION{ LONG Bias; WCHAR StandardName[32]; @@ -1553,6 +1566,7 @@ WINBASEAPI DWORD WINAPI GetDllDirectoryW(DWORD,LPWSTR); WINBASEAPI UINT WINAPI GetDriveTypeA(LPCSTR); WINBASEAPI UINT WINAPI GetDriveTypeW(LPCWSTR); #define GetDriveType WINELIB_NAME_AW(GetDriveType) +WINBASEAPI DWORD WINAPI GetDynamicTimeZoneInformation(PDYNAMIC_TIME_ZONE_INFORMATION); WINBASEAPI LPSTR WINAPI GetEnvironmentStringsA(void); WINBASEAPI LPWSTR WINAPI GetEnvironmentStringsW(void); #define GetEnvironmentStrings WINELIB_NAME_AW(GetEnvironmentStrings) @@ -1964,6 +1978,7 @@ WINBASEAPI BOOL WINAPI SetDefaultCommConfigW(LPCWSTR,LPCOMMCONFIG,DWORD); WINBASEAPI BOOL WINAPI SetDllDirectoryA(LPCSTR); WINBASEAPI BOOL WINAPI SetDllDirectoryW(LPCWSTR); #define SetDllDirectory WINELIB_NAME_AW(SetDllDirectory) +WINBASEAPI BOOL WINAPI SetDynamicTimeZoneInformation(CONST DYNAMIC_TIME_ZONE_INFORMATION*); WINBASEAPI BOOL WINAPI SetEndOfFile(HANDLE); WINBASEAPI BOOL WINAPI SetEnvironmentVariableA(LPCSTR,LPCSTR); WINBASEAPI BOOL WINAPI SetEnvironmentVariableW(LPCWSTR,LPCWSTR);

1 0

Mikołaj Zalewski : wordpad: Update Polish translation.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 0027353107f92226cabe632c7f7094226cc4ce68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0027353107f92226cabe632c7… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Feb 13 14:09:41 2008 +0100 wordpad: Update Polish translation. --- programs/wordpad/Pl.rc | 154 ++++++++++++++++++++++++------------------------ 1 files changed, 77 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0027353107f92226cabe6…

1 0

Mikołaj Zalewski : wordpad: File > New now opens a dialog so there should be an ellipsis at the end.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: a8fd0e0d691d116a393da3670354a26761f47018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8fd0e0d691d116a393da3670… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Feb 13 14:30:21 2008 +0100 wordpad: File > New now opens a dialog so there should be an ellipsis at the end. --- programs/wordpad/De.rc | 2 +- programs/wordpad/En.rc | 2 +- programs/wordpad/Fr.rc | 2 +- programs/wordpad/Hu.rc | 2 +- programs/wordpad/Ko.rc | 2 +- programs/wordpad/Nl.rc | 2 +- programs/wordpad/No.rc | 2 +- programs/wordpad/Ru.rc | 2 +- programs/wordpad/Tr.rc | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 3c2908f..f5ab003 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -22,7 +22,7 @@ IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&Datei" BEGIN - MENUITEM "&Neu\tStrg+N", ID_FILE_NEW + MENUITEM "&Neu...\tStrg+N", ID_FILE_NEW MENUITEM "�&ffnen...\tStrg+O", ID_FILE_OPEN MENUITEM "&Speichern\tStrg+S", ID_FILE_SAVE MENUITEM "Speichern &unter...", ID_FILE_SAVEAS diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index 67cd9ac..b449ae4 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -22,7 +22,7 @@ IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&File" BEGIN - MENUITEM "&New\tCtrl+N", ID_FILE_NEW + MENUITEM "&New . . .\tCtrl+N", ID_FILE_NEW MENUITEM "&Open . . .\tCtrl+O", ID_FILE_OPEN MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE MENUITEM "Save &as . . .", ID_FILE_SAVEAS diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index ff3da1e..4d23955 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -22,7 +22,7 @@ IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&Fichier" BEGIN - MENUITEM "&Nouveau\tCtrl+N", ID_FILE_NEW + MENUITEM "&Nouveau...\tCtrl+N", ID_FILE_NEW MENUITEM "&Ouvrir...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Enregistrer\tCtrl+S", ID_FILE_SAVE MENUITEM "Enregistrer &sous...", ID_FILE_SAVEAS diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 34ec7cc..dc01f62 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -22,7 +22,7 @@ IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&F�jl" BEGIN - MENUITEM "&�j\tCtrl+N", ID_FILE_NEW + MENUITEM "&�j...\tCtrl+N", ID_FILE_NEW MENUITEM "&Megnyit�s...\tCtrl+O", ID_FILE_OPEN MENUITEM "M&ent�s\tCtrl+S", ID_FILE_SAVE MENUITEM "Ment�s m�&sk�nt...", ID_FILE_SAVEAS diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 58a0c99..73d1780 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -24,7 +24,7 @@ IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "��(&F)" BEGIN - MENUITEM "�� (&N)\tCtrl+N", ID_FILE_NEW + MENUITEM "�� (&N)...\tCtrl+N", ID_FILE_NEW MENUITEM "��(&O)...\tCtrl+O", ID_FILE_OPEN MENUITEM "��(&S)\tCtrl+S", ID_FILE_SAVE MENUITEM "�ٸ� �̸�� (&A)...", ID_FILE_SAVEAS diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index d2c1a0f..62f3759 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -22,7 +22,7 @@ IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&Bestand" BEGIN - MENUITEM "&Nieuw\tCtrl+N" ID_FILE_NEW + MENUITEM "&Nieuw...\tCtrl+N" ID_FILE_NEW MENUITEM "&Openen...\tCtrl+O", ID_FILE_OPEN MENUITEM "O&pslaan\tCtrl+S", ID_FILE_SAVE MENUITEM "Ops&laan als...", ID_FILE_SAVEAS diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 4e258fd..01e6b7b 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -22,7 +22,7 @@ IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&Fil" BEGIN - MENUITEM "&Ny\tCtrl+N", ID_FILE_NEW + MENUITEM "&Ny...\tCtrl+N", ID_FILE_NEW MENUITEM "&�pne . . .\tCtrl+O", ID_FILE_OPEN MENUITEM "&Lagre\tCtrl+S", ID_FILE_SAVE MENUITEM "Lagre &som . . .", ID_FILE_SAVEAS diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index dddcdd7..3dcfc6d 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -22,7 +22,7 @@ IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&��" BEGIN - MENUITEM "��&��\tCtrl+N", ID_FILE_NEW + MENUITEM "��&��...\tCtrl+N",ID_FILE_NEW MENUITEM "&��...\tCtrl+O",ID_FILE_OPEN MENUITEM "&��\tCtrl+S", ID_FILE_SAVE MENUITEM "�� &��...", ID_FILE_SAVEAS diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index 0167127..26c6d88 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -24,7 +24,7 @@ IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&Dosya" BEGIN - MENUITEM "&Yeni\tCtrl+N", ID_FILE_NEW + MENUITEM "&Yeni...\tCtrl+N", ID_FILE_NEW MENUITEM "&A�...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Kaydet\tCtrl+S", ID_FILE_SAVE MENUITEM "&Farkl� Kaydet...", ID_FILE_SAVEAS

1 0

Paul Vriens : advapi32/tests: CryptVerifySignatureW is not implemented on win98.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: e2de4b18e5497854d3b30bb5b50cb7a19d446bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2de4b18e5497854d3b30bb5b… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 13 18:38:44 2008 +0100 advapi32/tests: CryptVerifySignatureW is not implemented on win98. --- dlls/advapi32/tests/crypt.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 4f5f431..413e201 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -400,6 +400,11 @@ static void test_verify_sig(void) SetLastError(0xdeadbeef); ret = pCryptVerifySignatureW(0, NULL, 0, 0, NULL, 0); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("CryptVerifySignatureW is not implemented\n"); + return; + } ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); ret = pCryptAcquireContextA(&prov, szKeySet, NULL, PROV_RSA_FULL,

1 0