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

Leonid Lobachev : wined3d: Add missing calling convention specifiers.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: f6cc091d75faa2d30edadfcd0fced223c7a988f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6cc091d75faa2d30edadfcd0… Author: Leonid Lobachev <Leonid.Lobachev(a)Sun.COM> Date: Thu Jul 23 14:53:54 2009 +0400 wined3d: Add missing calling convention specifiers. --- dlls/wined3d/gl_compat.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c index 2726173..30d3408 100644 --- a/dlls/wined3d/gl_compat.c +++ b/dlls/wined3d/gl_compat.c @@ -298,7 +298,7 @@ static void WINE_GLAPI wine_glVertex3fv(const GLfloat *pos) { wine_glVertex4f(pos[0], pos[1], pos[2], 1.0f); } -static void wine_glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a) { +static void WINE_GLAPI wine_glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a) { struct WineD3DContext *ctx = context_get_current(); ctx->color[0] = r; ctx->color[1] = g; @@ -307,36 +307,36 @@ static void wine_glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a) { old_fogcoord_glColor4f(r, g, b, a); } -static void wine_glColor4fv(const GLfloat *c) { +static void WINE_GLAPI wine_glColor4fv(const GLfloat *c) { wine_glColor4f(c[0], c[1], c[2], c[3]); } -static void wine_glColor3f(GLfloat r, GLfloat g, GLfloat b) { +static void WINE_GLAPI wine_glColor3f(GLfloat r, GLfloat g, GLfloat b) { wine_glColor4f(r, g, b, 1.0f); } -static void wine_glColor3fv(const GLfloat *c) { +static void WINE_GLAPI wine_glColor3fv(const GLfloat *c) { wine_glColor4f(c[0], c[1], c[2], 1.0f); } -static void wine_glColor4ub(GLubyte r, GLubyte g, GLubyte b, GLubyte a) { +static void WINE_GLAPI wine_glColor4ub(GLubyte r, GLubyte g, GLubyte b, GLubyte a) { wine_glColor4f(r / 255.0f, g / 255.0f, b / 255.0f, a / 255.0f); } /* In D3D the fog coord is a UBYTE, so there's no problem with using the single * precision function */ -static void wine_glFogCoordfEXT(GLfloat f) { +static void WINE_GLAPI wine_glFogCoordfEXT(GLfloat f) { struct WineD3DContext *ctx = context_get_current(); ctx->fog_coord_value = f; } -static void wine_glFogCoorddEXT(GLdouble f) { +static void WINE_GLAPI wine_glFogCoorddEXT(GLdouble f) { wine_glFogCoordfEXT(f); } -static void wine_glFogCoordfvEXT(const GLfloat *f) { +static void WINE_GLAPI wine_glFogCoordfvEXT(const GLfloat *f) { wine_glFogCoordfEXT(*f); } -static void wine_glFogCoorddvEXT(const GLdouble *f) { +static void WINE_GLAPI wine_glFogCoorddvEXT(const GLdouble *f) { wine_glFogCoordfEXT(*f); }

1 0

Dmitry Timoshkov : user32: Draw the whole button only if requested.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 8d54f582776d590b236e288f9ef8085bb221ccab URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d54f582776d590b236e288f9… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jul 23 19:44:13 2009 +0900 user32: Draw the whole button only if requested. --- dlls/user32/button.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index a61a4e7..1681949 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -826,6 +826,9 @@ static void PB_Paint( HWND hwnd, HDC hDC, UINT action ) hOldBrush = SelectObject(hDC,GetSysColorBrush(COLOR_BTNFACE)); oldBkMode = SetBkMode(hDC, TRANSPARENT); + /* completely skip the drawing if only focus has changed */ + if (action == ODA_FOCUS) goto draw_focus; + if (get_button_type(style) == BS_DEFPUSHBUTTON) { Rectangle(hDC, rc.left, rc.top, rc.right, rc.bottom); @@ -869,7 +872,9 @@ static void PB_Paint( HWND hwnd, HDC hDC, UINT action ) SetTextColor( hDC, oldTxtColor ); - if (state & BUTTON_HASFOCUS) +draw_focus: + if ((action == ODA_FOCUS) || + ((action == ODA_DRAWENTIRE) && (state & BUTTON_HASFOCUS))) { InflateRect( &focus_rect, -1, -1 ); IntersectRect(&focus_rect, &focus_rect, &rc);

1 0

Hans Leidekker : wininet: Add a regular authentication dialog.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 6b15db8717635170d7a2e52cbe5d56ca6ef1d78c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b15db8717635170d7a2e52cb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 23 12:05:58 2009 +0200 wininet: Add a regular authentication dialog. --- dlls/wininet/dialogs.c | 136 +++++++++++++++++++++++++++++++++++++++++--- dlls/wininet/resource.h | 2 + dlls/wininet/wininet_En.rc | 20 +++++++ 3 files changed, 149 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 3325c7b..7f150c7 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -95,6 +95,34 @@ done: } /*********************************************************************** + * WININET_GetServer + * + * Determine the name of the web server + */ +static BOOL WININET_GetServer( HINTERNET hRequest, LPWSTR szBuf, DWORD sz ) +{ + http_request_t *lpwhr; + http_session_t *lpwhs = NULL; + BOOL ret = FALSE; + + lpwhr = (http_request_t*) WININET_GetObject( hRequest ); + if (NULL == lpwhr) + goto done; + + lpwhs = lpwhr->lpHttpSession; + if (NULL == lpwhs) + goto done; + + lstrcpynW(szBuf, lpwhs->lpszHostName, sz); + + ret = TRUE; + +done: + WININET_Release( &lpwhr->hdr ); + return ret; +} + +/*********************************************************************** * WININET_GetAuthRealm * * Determine the name of the (basic) Authentication realm @@ -349,6 +377,90 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( } /*********************************************************************** + * WININET_PasswordDialog + */ +static INT_PTR WINAPI WININET_PasswordDialog( + HWND hdlg, UINT uMsg, WPARAM wParam, LPARAM lParam ) +{ + HWND hitem; + struct WININET_ErrorDlgParams *params; + WCHAR szRealm[0x80], szServer[0x80]; + + if( uMsg == WM_INITDIALOG ) + { + TRACE("WM_INITDIALOG (%08lx)\n", lParam); + + /* save the parameter list */ + params = (struct WININET_ErrorDlgParams*) lParam; + SetWindowLongPtrW( hdlg, GWLP_USERDATA, lParam ); + + /* extract the Realm from the response and show it */ + if( WININET_GetAuthRealm( params->hRequest, + szRealm, sizeof szRealm/sizeof(WCHAR), FALSE ) ) + { + hitem = GetDlgItem( hdlg, IDC_REALM ); + SetWindowTextW( hitem, szRealm ); + } + + /* extract the name of the server */ + if( WININET_GetServer( params->hRequest, + szServer, sizeof szServer/sizeof(WCHAR)) ) + { + hitem = GetDlgItem( hdlg, IDC_SERVER ); + SetWindowTextW( hitem, szServer ); + } + + WININET_GetSetPassword( hdlg, szServer, szRealm, FALSE ); + + return TRUE; + } + + params = (struct WININET_ErrorDlgParams*) + GetWindowLongPtrW( hdlg, GWLP_USERDATA ); + + switch( uMsg ) + { + case WM_COMMAND: + if( wParam == IDOK ) + { + WCHAR username[0x20], password[0x20]; + + username[0] = 0; + hitem = GetDlgItem( hdlg, IDC_USERNAME ); + if( hitem ) + GetWindowTextW( hitem, username, sizeof username/sizeof(WCHAR) ); + + password[0] = 0; + hitem = GetDlgItem( hdlg, IDC_PASSWORD ); + if( hitem ) + GetWindowTextW( hitem, password, sizeof password/sizeof(WCHAR) ); + + hitem = GetDlgItem( hdlg, IDC_SAVEPASSWORD ); + if( hitem && + SendMessageW( hitem, BM_GETSTATE, 0, 0 ) && + WININET_GetAuthRealm( params->hRequest, + szRealm, sizeof szRealm/sizeof(WCHAR), FALSE ) && + WININET_GetServer( params->hRequest, + szServer, sizeof szServer/sizeof(WCHAR)) ) + { + WININET_GetSetPassword( hdlg, szServer, szRealm, TRUE ); + } + WININET_SetAuthorization( params->hRequest, username, password, FALSE ); + + EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY ); + return TRUE; + } + if( wParam == IDCANCEL ) + { + EndDialog( hdlg, 0 ); + return TRUE; + } + break; + } + return FALSE; +} + +/*********************************************************************** * WININET_GetConnectionStatus */ static INT WININET_GetConnectionStatus( HINTERNET hRequest ) @@ -392,17 +504,23 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, switch( dwError ) { case ERROR_SUCCESS: - if( !(dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS ) ) + case ERROR_INTERNET_INCORRECT_PASSWORD: + if( !dwError && !(dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS ) ) return 0; - dwStatus = WININET_GetConnectionStatus( hRequest ); - if( HTTP_STATUS_PROXY_AUTH_REQ != dwStatus ) - return ERROR_SUCCESS; - return DialogBoxParamW( hwininet, MAKEINTRESOURCEW( IDD_PROXYDLG ), - hWnd, WININET_ProxyPasswordDialog, (LPARAM) &params ); - case ERROR_INTERNET_INCORRECT_PASSWORD: - return DialogBoxParamW( hwininet, MAKEINTRESOURCEW( IDD_PROXYDLG ), - hWnd, WININET_ProxyPasswordDialog, (LPARAM) &params ); + dwStatus = WININET_GetConnectionStatus( hRequest ); + switch (dwStatus) + { + case HTTP_STATUS_PROXY_AUTH_REQ: + return DialogBoxParamW( hwininet, MAKEINTRESOURCEW( IDD_PROXYDLG ), + hWnd, WININET_ProxyPasswordDialog, (LPARAM) &params ); + case HTTP_STATUS_DENIED: + return DialogBoxParamW( hwininet, MAKEINTRESOURCEW( IDD_AUTHDLG ), + hWnd, WININET_PasswordDialog, (LPARAM) &params ); + default: + WARN("unhandled status %u\n", dwStatus); + return 0; + } case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR: case ERROR_INTERNET_INVALID_CA: diff --git a/dlls/wininet/resource.h b/dlls/wininet/resource.h index 6cabaa0..279c112 100644 --- a/dlls/wininet/resource.h +++ b/dlls/wininet/resource.h @@ -21,6 +21,7 @@ #include <windef.h> #include <winuser.h> +#define IDD_AUTHDLG 0x399 #define IDD_PROXYDLG 0x400 #define IDC_PROXY 0x401 @@ -28,5 +29,6 @@ #define IDC_USERNAME 0x403 #define IDC_PASSWORD 0x404 #define IDC_SAVEPASSWORD 0x405 +#define IDC_SERVER 0x406 #define IDS_LANCONNECTION 0x500 diff --git a/dlls/wininet/wininet_En.rc b/dlls/wininet/wininet_En.rc index b0450af..d22d249 100644 --- a/dlls/wininet/wininet_En.rc +++ b/dlls/wininet/wininet_En.rc @@ -40,6 +40,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Cancel", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Authentication Required" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Please enter your username and password:", -1, 40, 6, 150, 15 + LTEXT "Server", -1, 40, 26, 50, 10 + LTEXT "Realm", -1, 40, 46, 50, 10 + LTEXT "User", -1, 40, 66, 50, 10 + LTEXT "Password", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Save this password (insecure)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "LAN Connection"

1 0

Hans Leidekker : wininet: Prepare for showing a regular authentication dialog.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 29162c6506a1d27decf6abfeab5ad94b6f647c45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29162c6506a1d27decf6abfea… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 23 12:05:25 2009 +0200 wininet: Prepare for showing a regular authentication dialog. --- dlls/wininet/dialogs.c | 58 ++++++++++++++++++++++++++++++----------------- 1 files changed, 37 insertions(+), 21 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 2235d85..3325c7b 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -99,16 +99,20 @@ done: * * Determine the name of the (basic) Authentication realm */ -static BOOL WININET_GetAuthRealm( HINTERNET hRequest, LPWSTR szBuf, DWORD sz ) +static BOOL WININET_GetAuthRealm( HINTERNET hRequest, LPWSTR szBuf, DWORD sz, BOOL proxy ) { LPWSTR p, q; - DWORD index; + DWORD index, query; static const WCHAR szRealm[] = { 'r','e','a','l','m','=',0 }; - /* extract the Realm from the proxy response and show it */ + if (proxy) + query = HTTP_QUERY_PROXY_AUTHENTICATE; + else + query = HTTP_QUERY_WWW_AUTHENTICATE; + + /* extract the Realm from the response and show it */ index = 0; - if( !HttpQueryInfoW( hRequest, HTTP_QUERY_PROXY_AUTHENTICATE, - szBuf, &sz, &index) ) + if( !HttpQueryInfoW( hRequest, query, szBuf, &sz, &index) ) return FALSE; /* @@ -118,11 +122,10 @@ static BOOL WININET_GetAuthRealm( HINTERNET hRequest, LPWSTR szBuf, DWORD sz ) p = strchrW( szBuf, ' ' ); if( !p || strncmpW( p+1, szRealm, strlenW(szRealm) ) ) { - ERR("proxy response wrong? (%s)\n", debugstr_w(szBuf)); + ERR("response wrong? (%s)\n", debugstr_w(szBuf)); return FALSE; } - /* remove quotes */ p += 7; if( *p == '"' ) @@ -203,14 +206,13 @@ static BOOL WININET_GetSetPassword( HWND hdlg, LPCWSTR szServer, } /*********************************************************************** - * WININET_SetProxyAuthorization + * WININET_SetAuthorization */ -static BOOL WININET_SetProxyAuthorization( HINTERNET hRequest, - LPWSTR username, LPWSTR password ) +static BOOL WININET_SetAuthorization( HINTERNET hRequest, LPWSTR username, + LPWSTR password, BOOL proxy ) { http_request_t *lpwhr; http_session_t *lpwhs; - appinfo_t *hIC; BOOL ret = FALSE; LPWSTR p; @@ -225,21 +227,35 @@ static BOOL WININET_SetProxyAuthorization( HINTERNET hRequest, goto done; } - hIC = lpwhs->lpAppInfo; - p = heap_strdupW(username); if( !p ) goto done; - HeapFree(GetProcessHeap(), 0, hIC->lpszProxyUsername); - hIC->lpszProxyUsername = p; - p = heap_strdupW(password); if( !p ) + { + HeapFree(GetProcessHeap(), 0, username); goto done; + } - HeapFree(GetProcessHeap(), 0, hIC->lpszProxyPassword); - hIC->lpszProxyPassword = p; + if (proxy) + { + appinfo_t *hIC = lpwhs->lpAppInfo; + + HeapFree(GetProcessHeap(), 0, hIC->lpszProxyUsername); + hIC->lpszProxyUsername = p; + + HeapFree(GetProcessHeap(), 0, hIC->lpszProxyPassword); + hIC->lpszProxyPassword = p; + } + else + { + HeapFree(GetProcessHeap(), 0, lpwhs->lpszUserName); + lpwhs->lpszUserName = p; + + HeapFree(GetProcessHeap(), 0, lpwhs->lpszPassword); + lpwhs->lpszPassword = p; + } ret = TRUE; @@ -268,7 +284,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( /* extract the Realm from the proxy response and show it */ if( WININET_GetAuthRealm( params->hRequest, - szRealm, sizeof szRealm/sizeof(WCHAR)) ) + szRealm, sizeof szRealm/sizeof(WCHAR), TRUE ) ) { hitem = GetDlgItem( hdlg, IDC_REALM ); SetWindowTextW( hitem, szRealm ); @@ -311,13 +327,13 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( if( hitem && SendMessageW( hitem, BM_GETSTATE, 0, 0 ) && WININET_GetAuthRealm( params->hRequest, - szRealm, sizeof szRealm/sizeof(WCHAR)) && + szRealm, sizeof szRealm/sizeof(WCHAR), TRUE ) && WININET_GetProxyServer( params->hRequest, szServer, sizeof szServer/sizeof(WCHAR)) ) { WININET_GetSetPassword( hdlg, szServer, szRealm, TRUE ); } - WININET_SetProxyAuthorization( params->hRequest, username, password ); + WININET_SetAuthorization( params->hRequest, username, password, TRUE ); EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY ); return TRUE;

1 0

Hans Leidekker : wininet: Don' t leak the proxy username and password in WININET_SetProxyAuthorization.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 1126b89360a089b6bd9d72d73e6932edb5cceaa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1126b89360a089b6bd9d72d73… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 23 12:04:59 2009 +0200 wininet: Don't leak the proxy username and password in WININET_SetProxyAuthorization. --- dlls/wininet/dialogs.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 4a4df92..2235d85 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -231,12 +231,14 @@ static BOOL WININET_SetProxyAuthorization( HINTERNET hRequest, if( !p ) goto done; + HeapFree(GetProcessHeap(), 0, hIC->lpszProxyUsername); hIC->lpszProxyUsername = p; p = heap_strdupW(password); if( !p ) goto done; + HeapFree(GetProcessHeap(), 0, hIC->lpszProxyPassword); hIC->lpszProxyPassword = p; ret = TRUE;

1 0

Hans Leidekker : wininet: Release the request in WININET_GetProxyServer and WININET_SetProxyAuthorization .
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 4b1e0de90f32cfb263fafd0fd009d6645478a0e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1e0de90f32cfb263fafd0fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 23 12:04:22 2009 +0200 wininet: Release the request in WININET_GetProxyServer and WININET_SetProxyAuthorization. --- dlls/wininet/dialogs.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index f98493a..4a4df92 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -65,19 +65,20 @@ static BOOL WININET_GetProxyServer( HINTERNET hRequest, LPWSTR szBuf, DWORD sz ) http_request_t *lpwhr; http_session_t *lpwhs = NULL; appinfo_t *hIC = NULL; + BOOL ret = FALSE; LPWSTR p; lpwhr = (http_request_t*) WININET_GetObject( hRequest ); if (NULL == lpwhr) - return FALSE; + goto done; lpwhs = lpwhr->lpHttpSession; if (NULL == lpwhs) - return FALSE; + goto done; hIC = lpwhs->lpAppInfo; if (NULL == hIC) - return FALSE; + goto done; lstrcpynW(szBuf, hIC->lpszProxy, sz); @@ -86,7 +87,11 @@ static BOOL WININET_GetProxyServer( HINTERNET hRequest, LPWSTR szBuf, DWORD sz ) if (p) *p = 0; - return TRUE; + ret = TRUE; + +done: + WININET_Release( &lpwhr->hdr ); + return ret; } /*********************************************************************** @@ -206,32 +211,39 @@ static BOOL WININET_SetProxyAuthorization( HINTERNET hRequest, http_request_t *lpwhr; http_session_t *lpwhs; appinfo_t *hIC; + BOOL ret = FALSE; LPWSTR p; lpwhr = (http_request_t*) WININET_GetObject( hRequest ); if( !lpwhr ) - return FALSE; - + return FALSE; + lpwhs = lpwhr->lpHttpSession; if (NULL == lpwhs || lpwhs->hdr.htype != WH_HHTTPSESSION) { INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - return FALSE; + goto done; } hIC = lpwhs->lpAppInfo; p = heap_strdupW(username); if( !p ) - return FALSE; + goto done; + hIC->lpszProxyUsername = p; p = heap_strdupW(password); if( !p ) - return FALSE; + goto done; + hIC->lpszProxyPassword = p; - return TRUE; + ret = TRUE; + +done: + WININET_Release( &lpwhr->hdr ); + return ret; } /***********************************************************************

1 0

Huw Davies : include: Add opnrst.idl.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 3eb5e861d845c9bc36ab40ac4156ce8c0daa619e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb5e861d845c9bc36ab40ac4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 22 14:25:27 2009 +0100 include: Add opnrst.idl. --- include/Makefile.in | 1 + include/oledb.idl | 1 + include/opnrst.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 4 files changed, 50 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index f53c1bb..716cec3 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -364,6 +364,7 @@ SRCDIR_INCLUDES = \ oleauto.h \ olectl.h \ oledlg.h \ + opnrst.idl \ pdh.h \ pdhmsg.h \ pktdef.h \ diff --git a/include/oledb.idl b/include/oledb.idl index 1683fb7..a2f70d5 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -29,3 +29,4 @@ typedef ULONG DBBYTEOFFSET; #include "dbcses.idl" #include "dbprop.idl" #include "dbinit.idl" +#include "opnrst.idl" diff --git a/include/opnrst.idl b/include/opnrst.idl new file mode 100644 index 0000000..07c2380 --- /dev/null +++ b/include/opnrst.idl @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + object, + uuid(0c733a69-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IOpenRowset : IUnknown +{ + [local] + HRESULT OpenRowset([in] IUnknown *pUnkOuter, + [in, unique] DBID *pTableID, + [in, unique] DBID *pIndexID, + [in] REFIID riid, + [in] ULONG cPropertySets, + [in, out, size_is(cPropertySets)] DBPROPSET rgPropertySets[], + [out, iid_is(riid)] IUnknown **ppRowset); + + [call_as(OpenRowset)] + HRESULT RemoteOpenRowset([in] IUnknown *pUnkOuter, + [in, unique] DBID *pTableID, + [in, unique] DBID *pIndexID, + [in] REFIID riid, + [in] ULONG cPropertySets, + [in, unique, size_is(cPropertySets)] DBPROPSET *rgPropertySets, + [in, out, unique, iid_is(riid)] IUnknown **ppRowset, + [in] ULONG cTotalProps, + [out, size_is(cTotalProps)] DBPROPSTATUS *rgPropStatus, + [out] IErrorInfo **ppErrorInfoRem); + +} diff --git a/tools/make_makefiles b/tools/make_makefiles index fc836ee..8f9ca56 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -116,6 +116,7 @@ my %private_idl_headers = ( "dbs.idl" => 1, "devenum.idl" => 1, "dyngraph.idl" => 1, + "opnrst.idl" => 1, "vmrender.idl" => 1, "wine/wined3d.idl" => 1, "wine/winedxgi.idl" => 1,

1 0

Huw Davies : include: Add dbcses.idl.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 659070ec3a5895bd904459033f2cfb8e0cee4a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=659070ec3a5895bd904459033… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 22 14:08:35 2009 +0100 include: Add dbcses.idl. --- include/Makefile.in | 1 + include/dbcses.idl | 36 ++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + tools/make_makefiles | 1 + 4 files changed, 39 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 2e4d309..f53c1bb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -149,6 +149,7 @@ SRCDIR_INCLUDES = \ d3dx9shader.h \ d3dx9tex.h \ dbccmd.idl \ + dbcses.idl \ dbghelp.h \ dbinit.idl \ dbprop.idl \ diff --git a/include/dbcses.idl b/include/dbcses.idl new file mode 100644 index 0000000..5441815 --- /dev/null +++ b/include/dbcses.idl @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + object, + uuid(0c733a5d-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IDBCreateSession : IUnknown +{ + [local] + HRESULT CreateSession([in] IUnknown *pUnkOuter, + [in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppDBSession); + + [call_as(CreateSession)] + HRESULT RemoteCreateSession([in] IUnknown *pUnkOuter, + [in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppDBSession, + [out] IErrorInfo **ppErrorInfoRem); +} diff --git a/include/oledb.idl b/include/oledb.idl index e8573f6..1683fb7 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -26,5 +26,6 @@ typedef ULONG DBBYTEOFFSET; #include "dbs.idl" #include "dbccmd.idl" +#include "dbcses.idl" #include "dbprop.idl" #include "dbinit.idl" diff --git a/tools/make_makefiles b/tools/make_makefiles index c618c19..fc836ee 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -110,6 +110,7 @@ my %private_idl_headers = ( "axcore.idl" => 1, "axextend.idl" => 1, "dbccmd.idl" => 1, + "dbcses.idl" => 1, "dbinit.idl" => 1, "dbprop.idl" => 1, "dbs.idl" => 1,

1 0

Huw Davies : include: Add dbccmd.idl.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 74b2ba2ef3001e8b3d0a48e10b714ed7681368e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b2ba2ef3001e8b3d0a48e10… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 22 14:03:06 2009 +0100 include: Add dbccmd.idl. --- include/Makefile.in | 1 + include/dbccmd.idl | 36 ++++++++++++++++++++++++++++++++++++ include/oledb.idl | 4 +++- tools/make_makefiles | 1 + 4 files changed, 41 insertions(+), 1 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 71a20ac..2e4d309 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -148,6 +148,7 @@ SRCDIR_INCLUDES = \ d3dx9mesh.h \ d3dx9shader.h \ d3dx9tex.h \ + dbccmd.idl \ dbghelp.h \ dbinit.idl \ dbprop.idl \ diff --git a/include/dbccmd.idl b/include/dbccmd.idl new file mode 100644 index 0000000..28763d2 --- /dev/null +++ b/include/dbccmd.idl @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + object, + uuid(0c733a1d-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IDBCreateCommand : IUnknown +{ + [local] + HRESULT CreateCommand([in] IUnknown *pUnkOuter, + [in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppCommand); + + [call_as(CreateCommand)] + HRESULT RemoteCreateCommand([in] IUnknown *pUnkOuter, + [in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppCommand, + [out] IErrorInfo **ppErrorInfoRem); +} diff --git a/include/oledb.idl b/include/oledb.idl index dd6b218..e8573f6 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -23,6 +23,8 @@ import "propidl.idl"; typedef ULONG DBBYTEOFFSET; -#include "dbinit.idl" #include "dbs.idl" + +#include "dbccmd.idl" #include "dbprop.idl" +#include "dbinit.idl" diff --git a/tools/make_makefiles b/tools/make_makefiles index f23706c..c618c19 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -109,6 +109,7 @@ my %exported_wine_headers = ( my %private_idl_headers = ( "axcore.idl" => 1, "axextend.idl" => 1, + "dbccmd.idl" => 1, "dbinit.idl" => 1, "dbprop.idl" => 1, "dbs.idl" => 1,

1 0

Vladimir Pankratov : write: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 8cc837a81756b7c41a37dbe057e4370fc9ef0433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cc837a81756b7c41a37dbe05… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 23 14:30:00 2009 +0500 write: Convert the Russian resources to UTF-8. --- programs/write/Ru.rc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/write/Ru.rc b/programs/write/Ru.rc index 5824ad1..008011f 100644 --- a/programs/write/Ru.rc +++ b/programs/write/Ru.rc @@ -20,9 +20,12 @@ #include "resources.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_FAILED, "�� Wordpad" + IDS_FAILED, "Не удалось запустить Wordpad" }

1 0

Vladimir Pankratov : xcopy: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 085237fd217015f6f12131fc37026769fc5a0dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=085237fd217015f6f12131fc3… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 23 14:30:09 2009 +0500 xcopy: Convert the Russian resources to UTF-8. --- programs/xcopy/Ru.rc | 81 ++++++++++++++++++++++++++------------------------ 1 files changed, 42 insertions(+), 39 deletions(-) diff --git a/programs/xcopy/Ru.rc b/programs/xcopy/Ru.rc index 3983457..154c999 100644 --- a/programs/xcopy/Ru.rc +++ b/programs/xcopy/Ru.rc @@ -22,26 +22,29 @@ #include "xcopy.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { STRING_INVPARMS, -"�� - �� 'xcopy /?' �� \n\ -�� .\n" +"Недопустимое число параметров - попробуйте 'xcopy /?' для получения\n\ +подробного описания.\n" STRING_INVPARM, -"�� '%s' - �� 'xcopy /?' �� \n\ -��.\n" - STRING_PAUSE, "�� <enter>, �� .\n" - STRING_SIMCOPY, "%d ��(��) �� .\n" - STRING_COPY, "%d ��(��) ��.\n" - STRING_QISDIR, "'%s' �� ?\n" \ - "(F - ��, D - ��)\n" +"Недопустимый параметр '%s' - попробуйте 'xcopy /?' для получения подробного\n\ +описания.\n" + STRING_PAUSE, "Нажмите клавишу <enter>, чтобы начать копирование.\n" + STRING_SIMCOPY, "%d файл(ов) было бы скопировано.\n" + STRING_COPY, "%d файл(ов) скопировано.\n" + STRING_QISDIR, "'%s' является файлом или папкой?\n" \ + "(F - Файл, D - Папка)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" - STRING_OVERWRITE,"�� %s? (Yes|No|All)\n" - STRING_COPYFAIL, "�� '%s' � '%s' �� : %d\n" - STRING_OPENFAIL, "�� '%s'\n" - STRING_READFAIL, "�� '%s' �� \n" + STRING_OVERWRITE,"Переписать %s? (Yes|No|All)\n" + STRING_COPYFAIL, "При копировании '%s' в '%s' произошла ошибка: %d\n" + STRING_OPENFAIL, "Невозможно открыть '%s'\n" + STRING_READFAIL, "При чтении '%s' произошла ошибка\n" STRING_YES_CHAR, "Y" STRING_NO_CHAR, "N" STRING_ALL_CHAR, "A" @@ -49,35 +52,35 @@ STRINGTABLE STRING_DIR_CHAR, "D" STRING_HELP, -"XCOPY - �� \n\ +"XCOPY - Копирует файлы и деревья папок\n\ \n\ -��:\n\ +Синтаксис:\n\ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ -��:\n\ +Где:\n\ \n\ -[/I] �� ,\n\ - �� .\n\ -[/S] �� .\n\ -[/E] �� , �� .\n\ -[/Q] �� .\n\ -[/F] �� .\n\ -[/L] �� , �� .\n\ -[/W] �� .\n\ -[/T] �� , �� .\n\ -[/Y] �� .\n\ -[/-Y] �� .\n\ -[/P] �� .\n\ -[/N] �� .\n\ -[/U] �� , �� .\n\ -[/R] �� , �� .\n\ -[/H] �� .\n\ -[/C] �� , �� .\n\ -[/A] �� , �� \"��\".\n\ -[/M] �� , �� \"��\",\n\ - �� .\n\ -[/D | /D:m-d-y] �� , �� \n\ - �� . �� , �� \n\ - �� , �� .\n" +[/I] Если конечная папка отсутствует и копируется более одного файла,\n\ + то предполагается папка в качестве места назначения.\n\ +[/S] Копирует папки и подпапки.\n\ +[/E] Копирует папки и подпапки, включая пустые.\n\ +[/Q] Не отображает имена копируемых файлов.\n\ +[/F] Отображает полные имена исходных и конечных файлов.\n\ +[/L] Выводит список файлов, которые будут скопированы.\n\ +[/W] Запрашивает подтверждение перед началом копирования.\n\ +[/T] Создает структуру папок, но не копирует файлы.\n\ +[/Y] Подавляет запрос на подтверждение перезаписи файлов.\n\ +[/-Y] Запрашивает подтверждение на перезапись файлов.\n\ +[/P] Запрашивает подтверждение для каждого копируемого файла.\n\ +[/N] Использует короткие имена файлов при копировании.\n\ +[/U] Копирует только те файлы, которые уже существуют в конечной папке.\n\ +[/R] Перезаписывает файлы, доступные только для чтения.\n\ +[/H] Копирует скрытые и системные файлы.\n\ +[/C] Продолжает работу, даже если произошла ошибка.\n\ +[/A] Копирует только те файлы, для которых установлен атрибут \"архивный\".\n\ +[/M] Копирует только те файлы, для которых установлен атрибут \"архивный\",\n\ + при этом атрибут удаляется.\n\ +[/D | /D:m-d-y] Копирует только новые файлы или те, которые были изменены\n\ + после указанной даты. Если дата не указана, копирует только\n\ + те файлы, которые новее в исходной папке.\n" }

1 0

Vladimir Pankratov : wordpad: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 60dcd6365eb79e2f9717165848c6427cfb99a221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60dcd6365eb79e2f971716584… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 23 14:29:45 2009 +0500 wordpad: Convert the Russian resources to UTF-8. --- programs/wordpad/Ru.rc | 223 ++++++++++++++++++++++++------------------------ 1 files changed, 113 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60dcd6365eb79e2f97171…

1 0

Vladimir Pankratov : winedbg: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 0c7b34bdd920be34b7f7448e014e5105896aad74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c7b34bdd920be34b7f7448e0… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 23 14:28:59 2009 +0500 winedbg: Convert the Russian resources to UTF-8. --- programs/winedbg/rsrc_Ru.rc | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/programs/winedbg/rsrc_Ru.rc b/programs/winedbg/rsrc_Ru.rc index 622ff7b..281537b 100644 --- a/programs/winedbg/rsrc_Ru.rc +++ b/programs/winedbg/rsrc_Ru.rc @@ -20,36 +20,39 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDM_DEBUG_POPUP MENU BEGIN POPUP "" BEGIN - MENUITEM "&��", ID_DEBUG + MENUITEM "&Отладка", ID_DEBUG END END IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "Ошибка программы" FONT 8, "Tahoma" BEGIN LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 - LTEXT "� �� %s �� \ - ��. �� .", + LTEXT "В программе %s обнаружена серьёзная ошибка и она должна быть \ + закрыта. Приносим извинения за неудобство.", IDC_STATIC_TXT1,27,10,224,30 - LTEXT "�� Wine. \ - �� http://appdb.winehq.org � �� \ - �� .\n\n\ - �� Windows � �� , \ - �� http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 - DEFPUSHBUTTON "��", IDOK, 205, 151, 60, 16, WS_TABSTOP + LTEXT "Ошибка могла быть вызвана проблемой в программе или недоработкой в Wine. \ + Вы можете посетить http://appdb.winehq.org и поискать советы о запуске \ + этой программы.\n\n\ + Если эта проблема не присутствует под Windows и ещё не была зарегистрирована, \ + вы можете сообщить о ней на http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "Закрыть", IDOK, 205, 151, 60, 16, WS_TABSTOP END STRINGTABLE BEGIN - IDS_AUTO_CAPTION "�� Wine" - IDS_INVALID_PARAMS "�� - �� " - IDS_UNIDENTIFIED "(��)" + IDS_AUTO_CAPTION "Ошибка Wine" + IDS_INVALID_PARAMS "Внутренние ошибки - получены неверные параметры" + IDS_UNIDENTIFIED "(неопределено)" END

1 0

Vladimir Pankratov : winhlp32: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 664cfe012a9a9779ce01195f044ae9c8641e9882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=664cfe012a9a9779ce01195f0… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 23 14:29:35 2009 +0500 winhlp32: Convert the Russian resources to UTF-8. --- programs/winhlp32/Ru.rc | 119 ++++++++++++++++++++++++---------------------- 1 files changed, 62 insertions(+), 57 deletions(-) diff --git a/programs/winhlp32/Ru.rc b/programs/winhlp32/Ru.rc index e2e6ef2..165094f 100644 --- a/programs/winhlp32/Ru.rc +++ b/programs/winhlp32/Ru.rc @@ -20,99 +20,104 @@ #include "winhelp_res.h" +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +MAIN_MENU MENU { - POPUP "&��" { - MENUITEM "&��", MNID_FILE_OPEN + POPUP "&Файл" { + MENUITEM "&Открыть", MNID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "&��", MNID_FILE_PRINT - MENUITEM "�� &��...", MNID_FILE_SETUP + MENUITEM "&Печатать", MNID_FILE_PRINT + MENUITEM "Настройка &принтера...", MNID_FILE_SETUP MENUITEM SEPARATOR - MENUITEM "&��", MNID_FILE_EXIT + MENUITEM "&Выход", MNID_FILE_EXIT } - POPUP "&��" { - MENUITEM "&��...", MNID_EDIT_COPYDLG + POPUP "&Правка" { + MENUITEM "&Копировать...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "&��...", MNID_EDIT_ANNOTATE + MENUITEM "&Заметки...", MNID_EDIT_ANNOTATE } - POPUP "&��" { - MENUITEM "&��...", MNID_BKMK_DEFINE + POPUP "&Закладка" { + MENUITEM "&Определить...", MNID_BKMK_DEFINE } - POPUP "&��" { - POPUP "�� " + POPUP "&Настройки" { + POPUP "Видимость окна справки" BEGIN - MENUITEM "�� ", MNID_OPTS_HELP_DEFAULT - MENUITEM "��", MNID_OPTS_HELP_VISIBLE - MENUITEM "�� ", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "По умолчанию", MNID_OPTS_HELP_DEFAULT + MENUITEM "Наверху", MNID_OPTS_HELP_VISIBLE + MENUITEM "Не наверху", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "��", MNID_OPTS_HISTORY - POPUP "��" + MENUITEM "История", MNID_OPTS_HISTORY + POPUP "Шрифт" BEGIN - MENUITEM "��", MNID_OPTS_FONTS_SMALL - MENUITEM "��", MNID_OPTS_FONTS_NORMAL - MENUITEM "��", MNID_OPTS_FONTS_LARGE + MENUITEM "Мелкий", MNID_OPTS_FONTS_SMALL + MENUITEM "Обычный", MNID_OPTS_FONTS_NORMAL + MENUITEM "Крупный", MNID_OPTS_FONTS_LARGE END - MENUITEM "�� ", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Использовать системные цвета", MNID_OPTS_SYSTEM_COLORS } - POPUP "&��" { - MENUITEM "�� &�� ", MNID_HELP_HELPON - MENUITEM "�� &��", MNID_HELP_HELPTOP + POPUP "&Справка" { + MENUITEM "Помощь &по помощи", MNID_HELP_HELPON + MENUITEM "Всегда &сверху", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "&��...", MNID_HELP_ABOUT + MENUITEM "&Информация...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&� Wine", MNID_HELP_WINE + MENUITEM "&О Wine", MNID_HELP_WINE #endif } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "��" +CAPTION "Указатель" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { -STID_WINE_HELP, "�� WINE" -STID_WHERROR, "��" -STID_WARNING, "��" -STID_INFO, "��" -STID_NOT_IMPLEMENTED, "�� " -STID_HLPFILE_ERROR_s, "�� `%s'" -STID_INDEX, "&��" -STID_CONTENTS, "��" -STID_BACK, "&��" -STID_ALL_FILES, "�� (*.*)" -STID_HELP_FILES_HLP, "�� (*.hlp)" -STID_FILE_NOT_FOUND_s "�� '%s'. �� ?" -STID_NO_RICHEDIT "�� richedit" -STID_PSH_INDEX, "��: " +STID_WINE_HELP, "Справка WINE" +STID_WHERROR, "ОШИБКА" +STID_WARNING, "ВНИМАНИЕ" +STID_INFO, "Информация" +STID_NOT_IMPLEMENTED, "Не реализованно" +STID_HLPFILE_ERROR_s, "Ошибка при чтении файла помощи `%s'" +STID_INDEX, "&Содержание" +STID_CONTENTS, "Начало" +STID_BACK, "&Назад" +STID_ALL_FILES, "Все файлы (*.*)" +STID_HELP_FILES_HLP, "Файлы справки (*.hlp)" +STID_FILE_NOT_FOUND_s "Не могу найти '%s'. Вы хотите найти этот файл самостоятельно?" +STID_NO_RICHEDIT "Не могу найти richedit" +STID_PSH_INDEX, "Содержание: " } -CONTEXT_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN - MENUITEM "��...", MNID_CTXT_ANNOTATE - MENUITEM "��", MNID_CTXT_COPY - MENUITEM "��...", MNID_CTXT_PRINT - POPUP "��" + MENUITEM "Заметки...", MNID_CTXT_ANNOTATE + MENUITEM "Копировать", MNID_CTXT_COPY + MENUITEM "Печать...", MNID_CTXT_PRINT + POPUP "Шрифт" BEGIN - MENUITEM "��", MNID_CTXT_FONTS_SMALL - MENUITEM "��", MNID_CTXT_FONTS_NORMAL - MENUITEM "��", MNID_CTXT_FONTS_LARGE + MENUITEM "Мелкий", MNID_CTXT_FONTS_SMALL + MENUITEM "Обычный", MNID_CTXT_FONTS_NORMAL + MENUITEM "Крупный", MNID_CTXT_FONTS_LARGE END - POPUP "�� " + POPUP "Видимость окна справки" BEGIN - MENUITEM "�� ", MNID_CTXT_HELP_DEFAULT - MENUITEM "��", MNID_CTXT_HELP_VISIBLE - MENUITEM "�� ", MNID_CTXT_HELP_NONVISIBLE + MENUITEM "По умолчанию", MNID_CTXT_HELP_DEFAULT + MENUITEM "Наверху", MNID_CTXT_HELP_VISIBLE + MENUITEM "Не наверху", MNID_CTXT_HELP_NONVISIBLE END - MENUITEM "�� ", MNID_CTXT_SYSTEM_COLORS + MENUITEM "Использовать системные цвета", MNID_CTXT_SYSTEM_COLORS END END

1 0

Vladimir Pankratov : winemine: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 1ae0eba68f6c6926112d408c3916e4e945144ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae0eba68f6c6926112d408c3… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 23 14:29:25 2009 +0500 winemine: Convert the Russian resources to UTF-8. --- programs/winemine/Ru.rc | 49 ++++++++++++++++++++++++---------------------- 1 files changed, 26 insertions(+), 23 deletions(-) diff --git a/programs/winemine/Ru.rc b/programs/winemine/Ru.rc index e323e24..d990fe5 100644 --- a/programs/winemine/Ru.rc +++ b/programs/winemine/Ru.rc @@ -21,6 +21,9 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { @@ -31,33 +34,33 @@ STRINGTABLE { MENU_WINEMINE MENU DISCARDABLE { - POPUP "&��" { - MENUITEM "&�� \tF2", IDM_NEW + POPUP "&Игра" { + MENUITEM "&Новая игра\tF2", IDM_NEW MENUITEM SEPARATOR - MENUITEM "&�� ", IDM_MARKQ + MENUITEM "&Вопросительные знаки", IDM_MARKQ MENUITEM SEPARATOR - MENUITEM "��&��", IDM_BEGINNER - MENUITEM "&��", IDM_ADVANCED - MENUITEM "&��", IDM_EXPERT - MENUITEM "�� &��", IDM_CUSTOM + MENUITEM "Нови&чок", IDM_BEGINNER + MENUITEM "&Мастер", IDM_ADVANCED + MENUITEM "&Эксперт", IDM_EXPERT + MENUITEM "Нестандартные &параметры", IDM_CUSTOM MENUITEM SEPARATOR - MENUITEM "&��\tAlt+X", IDM_EXIT + MENUITEM "&Закрыть\tAlt+X", IDM_EXIT } - POPUP "&��" { - MENUITEM "&�� ", IDM_TIMES - MENUITEM "&� ��", IDM_ABOUT + POPUP "&Справка" { + MENUITEM "&Лучшее время", IDM_TIMES + MENUITEM "&О программе", IDM_ABOUT } } DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "�� " +CAPTION "Лучшее время" { - GROUPBOX "�� ", -1, 10, 10, 140, 45 - LTEXT "��", -1, 20, 20, 40, 8 - LTEXT "��", -1, 20, 30, 40, 8 - LTEXT "��", -1, 20, 40, 40, 8 + GROUPBOX "Лучшее время", -1, 10, 10, 140, 45 + LTEXT "Новичок", -1, 20, 20, 40, 8 + LTEXT "Мастер", -1, 20, 30, 40, 8 + LTEXT "Эксперт", -1, 20, 40, 40, 8 LTEXT "999", IDC_TIME1, 70, 20, 15, 8 LTEXT "999", IDC_TIME2, 70, 30, 15, 8 LTEXT "999", IDC_TIME3, 70, 40, 15, 8 @@ -70,9 +73,9 @@ CAPTION " DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "��!" +CAPTION "Поздравляю!" { - LTEXT "��, �� ", -1, 10, 10, 150, 10 + LTEXT "Пожалуйста, введите Ваше имя", -1, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 } @@ -80,14 +83,14 @@ CAPTION " DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 140, 100 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "�� " +CAPTION "Нестандартные параметры" { - LTEXT "�� ", -1, 5, 5, 70, 10 - LTEXT "�� ", -1, 5, 35, 70, 10 - LTEXT "�� ", -1, 5, 65, 70, 10 + LTEXT "По вертикали", -1, 5, 5, 70, 10 + LTEXT "По горизонтали", -1, 5, 35, 70, 10 + LTEXT "Число мин", -1, 5, 65, 70, 10 EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER DEFPUSHBUTTON "OK", IDOK, 80, 30, 50, 15 - PUSHBUTTON "��", IDCANCEL, 80, 50, 50, 15 + PUSHBUTTON "Отмена", IDCANCEL, 80, 50, 50, 15 }

1 0

Vladimir Pankratov : winefile: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: f7430fa05d9a6253c5625de2803efd997f4f8ec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7430fa05d9a6253c5625de28… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 23 14:29:07 2009 +0500 winefile: Convert the Russian resources to UTF-8. --- programs/winefile/Ru.rc | 245 ++++++++++++++++++++++++----------------------- 1 files changed, 124 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7430fa05d9a6253c5625…

1 0

Vladimir Pankratov : wineconsole: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 1cae50f421efca5babaf2807b392ec2782a23db1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cae50f421efca5babaf2807b… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 23 14:28:44 2009 +0500 wineconsole: Convert the Russian resources to UTF-8. --- programs/wineconsole/wineconsole_Ru.rc | 125 ++++++++++++++++---------------- 1 files changed, 64 insertions(+), 61 deletions(-) diff --git a/programs/wineconsole/wineconsole_Ru.rc b/programs/wineconsole/wineconsole_Ru.rc index 40154a3..0cebb2d 100644 --- a/programs/wineconsole/wineconsole_Ru.rc +++ b/programs/wineconsole/wineconsole_Ru.rc @@ -20,78 +20,81 @@ #include "wineconsole_res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN -IDS_EDIT, "&��" -IDS_DEFAULT, "�� &��" -IDS_PROPERTIES, "�&��" -IDS_MARK, "&��" -IDS_COPY, "&��" -IDS_PASTE, "&��" -IDS_SELECTALL, "�� &��" -IDS_SCROLL, "��&��" -IDS_SEARCH, "��&��" -IDS_FNT_DISPLAY, "�� %ld �� %ld �� " -IDS_FNT_PREVIEW_1, "�� " +IDS_EDIT, "&Правка" +IDS_DEFAULT, "По &умолчанию" +IDS_PROPERTIES, "С&войства" +IDS_MARK, "&Выделить" +IDS_COPY, "&Копировать" +IDS_PASTE, "&Вставить" +IDS_SELECTALL, "Выделить в&се" +IDS_SCROLL, "Прок&рутить" +IDS_SEARCH, "По&иск" +IDS_FNT_DISPLAY, "Каждый символ %ld пикселей в ширину и %ld пикселей в высоту" +IDS_FNT_PREVIEW_1, "Это тест" IDS_FNT_PREVIEW_2, "This is a test" -IDS_DLG_TIT_DEFAULT, "�� - �� " -IDS_DLG_TIT_CURRENT, "�� - �� " -IDS_DLG_TIT_ERROR, "�� " -IDS_DLG_ERR_SBWINSIZE, "�� " - -IDS_CMD_INVALID_EVENT_ID "wineconsole: �� \n" -IDS_CMD_INVALID_BACKEND "wineconsole: �� backend\n" -IDS_CMD_INVALID_OPTION "wineconsole: �� \n" -IDS_CMD_ABOUT "�� Wine\n" -IDS_CMD_LAUNCH_FAILED "wineconsole: �� '%s'.\n"\ - "�� .\n" - -IDS_USAGE_HEADER "\n��:\n wineconsole [��] <��>\n\n��:\n" -IDS_USAGE_BACKEND " --backend={user|curses} �� 'user' �� \n"\ - " �� . 'curses' - ��\n"\ - " �� \n"\ -IDS_USAGE_COMMAND " <��> �� Wine\n" -IDS_USAGE_FOOTER "\n��:\n wineconsole cmd\n�� Wine � �� Wine\n\n" +IDS_DLG_TIT_DEFAULT, "Настройка - Установки по умолчанию" +IDS_DLG_TIT_CURRENT, "Настройка - Текущие установки" +IDS_DLG_TIT_ERROR, "Ошибка настройки" +IDS_DLG_ERR_SBWINSIZE, "Размер буфера экрана должен быть не менее буфера окна" + +IDS_CMD_INVALID_EVENT_ID "wineconsole: Не верно указан код события\n" +IDS_CMD_INVALID_BACKEND "wineconsole: Не известный backend\n" +IDS_CMD_INVALID_OPTION "wineconsole: Указанная опция не найдена\n" +IDS_CMD_ABOUT "Запуск программы в консоли Wine\n" +IDS_CMD_LAUNCH_FAILED "wineconsole: Не удался запуск программы '%s'.\n"\ + "Не верно указанна команда.\n" + +IDS_USAGE_HEADER "\nВызов:\n wineconsole [опции] <команда>\n\nОпции:\n" +IDS_USAGE_BACKEND " --backend={user|curses} Выбор 'user' откроет новое окно с полной поддержкой\n"\ + " всех режимов работы консоли. 'curses' - использует\n"\ + " текущее окно с ограниченной функциональностью\n"\ +IDS_USAGE_COMMAND " <команда> Имя программы для запуска в консоли Wine\n" +IDS_USAGE_FOOTER "\nНапример:\n wineconsole cmd\nЗапустить командный процессор Wine в консоли Wine\n\n" END IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION " �� " +CAPTION " Опции " FONT 8, "MS Shell Dlg" { - GROUPBOX "�� ", -1, 10, 11, 60, 54, BS_GROUPBOX - AUTORADIOBUTTON "&��", IDC_OPT_CURSOR_SMALL, 14, 23, 52, 10, WS_TABSTOP - AUTORADIOBUTTON "&��", IDC_OPT_CURSOR_MEDIUM, 14, 33, 52, 10, WS_TABSTOP - AUTORADIOBUTTON "&��", IDC_OPT_CURSOR_LARGE, 14, 43, 52, 10, WS_TABSTOP - - GROUPBOX "��", -1, 75, 11, 123, 54, BS_GROUPBOX - LTEXT "�� ", -1, 79, 23, 50, 20 - AUTOCHECKBOX "&�trl", IDC_OPT_CONF_CTRL, 144, 23, 52, 10, WS_TABSTOP + GROUPBOX "Размер курсора", -1, 10, 11, 60, 54, BS_GROUPBOX + AUTORADIOBUTTON "&Маленький", IDC_OPT_CURSOR_SMALL, 14, 23, 52, 10, WS_TABSTOP + AUTORADIOBUTTON "&Средний", IDC_OPT_CURSOR_MEDIUM, 14, 33, 52, 10, WS_TABSTOP + AUTORADIOBUTTON "&Большой", IDC_OPT_CURSOR_LARGE, 14, 43, 52, 10, WS_TABSTOP + + GROUPBOX "Управление", -1, 75, 11, 123, 54, BS_GROUPBOX + LTEXT "Всплывающее меню", -1, 79, 23, 50, 20 + AUTOCHECKBOX "&Сtrl", IDC_OPT_CONF_CTRL, 144, 23, 52, 10, WS_TABSTOP AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 144, 33, 52, 10, WS_TABSTOP - LTEXT "�� ", -1, 79, 43, 60, 20 - AUTOCHECKBOX "&��", IDC_OPT_QUICK_EDIT, 144, 51, 52, 10, WS_TABSTOP + LTEXT "Быстрое редактирование", -1, 79, 43, 60, 20 + AUTOCHECKBOX "&включить", IDC_OPT_QUICK_EDIT, 144, 51, 52, 10, WS_TABSTOP - GROUPBOX "�� ", -1, 10, 67, 189, 35, BS_GROUPBOX - LTEXT "&�� :", -1, 14, 77, 78, 18 + GROUPBOX "История команд", -1, 10, 67, 189, 35, BS_GROUPBOX + LTEXT "&История команд:", -1, 14, 77, 78, 18 EDITTEXT IDC_OPT_HIST_SIZE, 82, 79, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - AUTOCHECKBOX "&�� ", IDC_OPT_HIST_NODOUBLE, 120, 77, 70, 18, WS_TABSTOP|BS_MULTILINE + AUTOCHECKBOX "&Удалять дублирующиеся", IDC_OPT_HIST_NODOUBLE, 120, 77, 70, 18, WS_TABSTOP|BS_MULTILINE } IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION " �� " +CAPTION " Шрифт " FONT 8, "MS Shell Dlg" { - LTEXT "&��", -1, 5, 5, 24, 8 + LTEXT "&Шрифт", -1, 5, 5, 24, 8 LISTBOX IDC_FNT_LIST_FONT, 5, 18, 90, 42, LBS_SORT|WS_VSCROLL - LTEXT "&��", -1, 100, 5, 50, 8 + LTEXT "&Цвет", -1, 100, 5, 50, 8 CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16 CONTROL "", IDC_FNT_COLOR_BK, "WineConColorPreview", 0L, 100, 40, 48, 16 - LTEXT "&��", -1, 158, 5, 40, 8 + LTEXT "&Размер", -1, 158, 5, 40, 8 LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 60, WS_VSCROLL CONTROL "", IDC_FNT_PREVIEW, "WineConFontPreview", 0L, 5, 60, 109, 40 LTEXT "", IDC_FNT_FONT_INFO, 128, 71, 80, 25 @@ -99,41 +102,41 @@ FONT 8, "MS Shell Dlg" IDD_CONFIG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION " �� " +CAPTION " Настройка " FONT 8, "MS Shell Dlg" { - GROUPBOX "�� ", -1, 10, 11, 100, 42, BS_GROUPBOX - LTEXT "&�� :", -1, 14, 25, 54, 9 + GROUPBOX "Зона буфера", -1, 8, 11, 100, 42, BS_GROUPBOX + LTEXT "&Ширина :", -1, 14, 25, 54, 9 EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - LTEXT "&�� :", -1, 14, 39, 54, 9 + LTEXT "&Высота :", -1, 14, 39, 54, 9 EDITTEXT IDC_CNF_SB_HEIGHT, 68, 37, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - GROUPBOX "�� ", -1, 10, 55, 100, 42 - LTEXT "�&�� :", -1, 14, 69, 54, 9 + GROUPBOX "Размер окна", -1, 8, 55, 100, 42 + LTEXT "Ш&ирина :", -1, 14, 69, 54, 9 EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - LTEXT "�&�� :", -1, 14, 83, 54, 9 + LTEXT "В&ысота :", -1, 14, 83, 54, 9 EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - GROUPBOX "�� ", -1, 115, 11, 85, 42, BS_GROUPBOX - AUTOCHECKBOX "&�� ", IDC_CNF_CLOSE_EXIT, 119, 25, 75, 20, WS_TABSTOP + GROUPBOX "Завершение программы", -1, 112, 11, 90, 43, BS_GROUPBOX + AUTOCHECKBOX "&Закрывать консоль", IDC_CNF_CLOSE_EXIT, 119, 25, 79, 20, WS_TABSTOP - GROUPBOX "��", -1, 115, 55, 85, 42 + GROUPBOX "Редактирование", -1, 112, 55, 90, 42 COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 75, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP } IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 198, 70 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "�� " +CAPTION "Параметры консоли" FONT 8, "MS Shell Dlg" { GROUPBOX "", -1, 10, 10, 178, 31, BS_GROUPBOX - AUTORADIOBUTTON "�� ", IDC_SAV_SAVE, 14, 27, 170, 10, WS_TABSTOP - AUTORADIOBUTTON "�� ", IDC_SAV_SESSION, 14, 15, 170, 10, WS_TABSTOP + AUTORADIOBUTTON "Сохранить эти настройки для будущих сессий", IDC_SAV_SAVE, 14, 27, 170, 10, WS_TABSTOP + AUTORADIOBUTTON "Изменить только текущую сессию", IDC_SAV_SESSION, 14, 15, 170, 10, WS_TABSTOP PUSHBUTTON "OK", IDOK, 40, 50, 50, 14 - PUSHBUTTON "��", IDCANCEL, 110, 50, 50, 14 + PUSHBUTTON "Отмена", IDCANCEL, 110, 50, 50, 14 }

1 0

Henri Verbeet : wined3d: get_drawable_size() needs a context.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 357ea123d909639991d2007e9e18a1f115a8b29e URL: http://source.winehq.org/git/wine.git/?a=commit;h=357ea123d909639991d2007e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 10:54:37 2009 +0200 wined3d: get_drawable_size() needs a context. --- dlls/wined3d/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 94000df..10b20fb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4942,9 +4942,10 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa } } + ActivateContext(This, (IWineD3DSurface *)target, CTXUSAGE_CLEAR); + target->get_drawable_size(target, &drawable_width, &drawable_height); - ActivateContext(This, (IWineD3DSurface *) target, CTXUSAGE_CLEAR); ENTER_GL(); /* Only set the values up once, as they are not changing */

1 0

Henri Verbeet : wined3d: Return the activated context from ActivateContext( ).
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: ea2caa9ba190bd3aae91d85ee4f949e3382e5d9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea2caa9ba190bd3aae91d85ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 10:54:36 2009 +0200 wined3d: Return the activated context from ActivateContext(). --- dlls/wined3d/context.c | 5 ++++- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1d25afc..5afbda7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1794,7 +1794,8 @@ static void context_apply_draw_buffer(struct WineD3DContext *context, BOOL blit) * usage: Prepares the context for blitting, drawing or other actions * *****************************************************************************/ -void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextUsage usage) { +struct WineD3DContext *ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, enum ContextUsage usage) +{ struct WineD3DContext *current_context = context_get_current(); DWORD tid = GetCurrentThreadId(); DWORD i, dirtyState, idx; @@ -1929,4 +1930,6 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU default: FIXME("Unexpected context usage requested\n"); } + + return context; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a28878e..bb64875 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1262,7 +1262,7 @@ typedef enum ContextUsage { CTXUSAGE_CLEAR = 4, /* Drawable and states are set up for clearing */ } ContextUsage; -void ActivateContext(IWineD3DDeviceImpl *device, IWineD3DSurface *target, ContextUsage usage); +struct WineD3DContext *ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, enum ContextUsage usage); WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, HWND win, BOOL create_pbuffer, const WINED3DPRESENT_PARAMETERS *pPresentParms); void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context); void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource, WINED3DRESOURCETYPE type);

1 0

Henri Verbeet : wined3d: Explicitly pass the wined3d context to context_apply_draw_buffer().
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 85e2c05e4ff666d2b7ae6a0e0bcce74a6d10ecc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85e2c05e4ff666d2b7ae6a0e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 10:54:35 2009 +0200 wined3d: Explicitly pass the wined3d context to context_apply_draw_buffer(). --- dlls/wined3d/context.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 61173fb..1d25afc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1734,16 +1734,19 @@ retry: } /* Context activation is done by the caller. */ -static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target, BOOL blit) +static void context_apply_draw_buffer(struct WineD3DContext *context, BOOL blit) { - const struct wined3d_gl_info *gl_info = This->activeContext->gl_info; + const struct wined3d_gl_info *gl_info = context->gl_info; + IWineD3DSurface *rt = context->current_rt; IWineD3DSwapChain *swapchain; + IWineD3DDeviceImpl *device; - if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) + device = ((IWineD3DSurfaceImpl *)rt)->resource.wineD3DDevice; + if (SUCCEEDED(IWineD3DSurface_GetContainer(rt, &IID_IWineD3DSwapChain, (void **)&swapchain))) { IWineD3DSwapChain_Release((IUnknown *)swapchain); ENTER_GL(); - glDrawBuffer(surface_get_gl_buffer(target, swapchain)); + glDrawBuffer(surface_get_gl_buffer(rt, swapchain)); checkGLcall("glDrawBuffers()"); LEAVE_GL(); } @@ -1756,12 +1759,12 @@ static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target, { if (GL_SUPPORT(ARB_DRAW_BUFFERS)) { - GL_EXTCALL(glDrawBuffersARB(GL_LIMITS(buffers), This->draw_buffers)); + GL_EXTCALL(glDrawBuffersARB(GL_LIMITS(buffers), device->draw_buffers)); checkGLcall("glDrawBuffers()"); } else { - glDrawBuffer(This->draw_buffers[0]); + glDrawBuffer(device->draw_buffers[0]); checkGLcall("glDrawBuffer()"); } } else { @@ -1771,7 +1774,7 @@ static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target, } else { - glDrawBuffer(This->offscreenBuffer); + glDrawBuffer(device->offscreenBuffer); checkGLcall("glDrawBuffer()"); } LEAVE_GL(); @@ -1836,7 +1839,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU LEAVE_GL(); } if (context->draw_buffer_dirty) { - apply_draw_buffer(This, target, FALSE); + context_apply_draw_buffer(context, FALSE); context->draw_buffer_dirty = FALSE; } break; @@ -1858,7 +1861,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU context->draw_buffer_dirty = TRUE; } if (context->draw_buffer_dirty) { - apply_draw_buffer(This, target, TRUE); + context_apply_draw_buffer(context, TRUE); if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) { context->draw_buffer_dirty = FALSE; }

1 0

Henri Verbeet : wined3d: Get rid of last_device.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 9253bbcb05fcde7ba5132a85f4a2cdb05aeeffb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9253bbcb05fcde7ba5132a85f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 10:54:34 2009 +0200 wined3d: Get rid of last_device. --- dlls/wined3d/context.c | 15 --------------- dlls/wined3d/directx.c | 1 - dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2e50634..61173fb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -29,19 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION (*gl_info) -/* The last used device. - * - * If the application creates multiple devices and switches between them, ActivateContext has to - * change the opengl context. This flag allows to keep track which device is active - */ -static IWineD3DDeviceImpl *last_device; static DWORD wined3d_context_tls_idx; -void context_set_last_device(IWineD3DDeviceImpl *device) -{ - last_device = device; -} - /* FBO helper functions */ /* GL locking is done by the caller */ @@ -1193,7 +1182,6 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } LEAVE_GL(); - context_set_last_device(This); This->frag_pipe->enable_extension((IWineD3DDevice *) This, TRUE); return ret; @@ -1283,8 +1271,6 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) context_destroy_gl_resources(context); destroy = TRUE; - context_set_last_device(NULL); - if (This->activeContext == context) { This->activeContext = NULL; @@ -1840,7 +1826,6 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU } } This->activeContext = context; - context_set_last_device(This); switch (usage) { case CTXUSAGE_CLEAR: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9daffaa..e6fb1c7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -284,7 +284,6 @@ static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) ERR_(d3d_caps)("Failed to make fake GL context current.\n"); goto fail; } - context_set_last_device(NULL); return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 363eb13..a28878e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1271,7 +1271,6 @@ void context_attach_depth_stencil_fbo(struct WineD3DContext *context, GLenum fbo_target, IWineD3DSurface *depth_stencil, BOOL use_render_buffer); void context_attach_surface_fbo(const struct WineD3DContext *context, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface); -void context_set_last_device(IWineD3DDeviceImpl *device); struct WineD3DContext *context_get_current(void); DWORD context_get_tls_idx(void); BOOL context_set_current(struct WineD3DContext *ctx);

1 0

Henri Verbeet : wined3d: Remove some unnecessary code.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 401e99b0c074af848379b2602df37fb1e6c7536b URL: http://source.winehq.org/git/wine.git/?a=commit;h=401e99b0c074af848379b2602… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 10:54:33 2009 +0200 wined3d: Remove some unnecessary code. Now that we don't depend on activeContext and lastActiveRenderTarget to be non-NULL this code can go. --- dlls/wined3d/context.c | 52 ++------------------------------------------- dlls/wined3d/swapchain.c | 16 -------------- 2 files changed, 3 insertions(+), 65 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 02159fb..2e50634 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -467,59 +467,13 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; UINT i; + if (!This->d3d_initialized) return; + switch(type) { case WINED3DRTYPE_SURFACE: { - if (This->activeContext && (IWineD3DSurface *)resource == This->activeContext->current_rt) - { - IWineD3DSwapChainImpl *swapchain; - - TRACE("Last active render target destroyed.\n"); - - /* Find a replacement surface for the currently active back - * buffer. The context manager does not do NULL checks, so - * switch to a valid target as long as the currently set - * surface is still valid. Use the surface of the implicit - * swpchain. If that is the same as the destroyed surface the - * device is destroyed and the lastActiveRenderTarget member - * shouldn't matter. */ - swapchain = This->swapchains ? (IWineD3DSwapChainImpl *)This->swapchains[0] : NULL; - if (swapchain) - { - if (swapchain->backBuffer && swapchain->backBuffer[0] != (IWineD3DSurface *)resource) - { - TRACE("Activating primary back buffer.\n"); - ActivateContext(This, swapchain->backBuffer[0], CTXUSAGE_RESOURCELOAD); - } - else if (!swapchain->backBuffer && swapchain->frontBuffer != (IWineD3DSurface *)resource) - { - /* Single buffering environment */ - TRACE("Activating primary front buffer.\n"); - - ActivateContext(This, swapchain->frontBuffer, CTXUSAGE_RESOURCELOAD); - } - else - { - /* Implicit render target destroyed, that means the - * device is being destroyed whatever we set here, it - * shouldn't matter. */ - TRACE("Device is being destroyed, setting current_rt to 0xdeadbabe.\n"); - This->activeContext->current_rt = (IWineD3DSurface *)0xdeadbabe; - } - } - else - { - WARN("Render target set, but swapchain does not exist!\n"); - - /* May happen during ddraw uninitialization. */ - This->activeContext->current_rt = (IWineD3DSurface *)0xdeadcafe; - } - } - else if (This->d3d_initialized) - { - ActivateContext(This, NULL, CTXUSAGE_RESOURCELOAD); - } + ActivateContext(This, NULL, CTXUSAGE_RESOURCELOAD); for (i = 0; i < This->numContexts; ++i) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 27770ca..683640a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -66,22 +66,6 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB for (i = 0; i < This->num_contexts; ++i) { - if (This->context[i] == This->wineD3DDevice->activeContext) - { - IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)This->wineD3DDevice->swapchains[0]; - - /* Avoid destroying the currently active context for non-implicit swapchains. */ - if (This != swapchain) - { - TRACE("Would destroy currently active context %p on a non-implicit swapchain.\n", This->context[i]); - - if (swapchain->backBuffer) - ActivateContext(This->wineD3DDevice, swapchain->backBuffer[0], CTXUSAGE_RESOURCELOAD); - else - ActivateContext(This->wineD3DDevice, swapchain->frontBuffer, CTXUSAGE_RESOURCELOAD); - } - } - DestroyContext(This->wineD3DDevice, This->context[i]); } /* Restore the screen resolution if we rendered in fullscreen

1 0

Henri Verbeet : wined3d: Don't reuse contexts marked for destruction.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 57ccdb7e368329cf7e64b4619802becb95115939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57ccdb7e368329cf7e64b4619… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 10:54:32 2009 +0200 wined3d: Don't reuse contexts marked for destruction. --- dlls/wined3d/context.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d82d2dc..02159fb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1609,6 +1609,8 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf const struct GlPixelFormatDesc *old, *new; struct WineD3DContext *context; + if (current_context && current_context->destroyed) current_context = NULL; + if (!target) { if (current_context

1 0

Paul Vriens : jscript: Add Dutch translations.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 40af06a5768e9962b7b1f7b385ee2d170f1d414e URL: http://source.winehq.org/git/wine.git/?a=commit;h=40af06a5768e9962b7b1f7b38… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 23 10:01:51 2009 +0200 jscript: Add Dutch translations. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_Nl.rc | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 4324896..489567f 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -10,6 +10,7 @@ RC_SRCS = \ jscript_En.rc \ jscript_Fr.rc \ jscript_Lt.rc \ + jscript_Nl.rc \ rsrc.rc C_SRCS = \ diff --git a/dlls/jscript/jscript_Nl.rc b/dlls/jscript/jscript_Nl.rc new file mode 100644 index 0000000..50cf92d --- /dev/null +++ b/dlls/jscript/jscript_Nl.rc @@ -0,0 +1,35 @@ +/* + * Copyright 2009 Paul Vriens + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_TO_PRIMITIVE "Fout bij het omzetten van het object naar een primitief type" + IDS_INVALID_CALL_ARG "Ongeldige procedure-aanroep of argument" + IDS_NO_PROPERTY "Dit object ondersteunt deze eigenschap of methode niet" + IDS_ARG_NOT_OPT "Argument is niet optioneel" + IDS_NOT_FUNC "Functie verwacht" + IDS_NOT_DATE "'[object]' is geen datum object" + IDS_NOT_NUM "Getal verwacht" + IDS_UNDEFINED "'|' is ongedefinieerd" + IDS_NOT_BOOL "Boolean object verwacht" + IDS_INVALID_LENGTH "Array lengte moet een eindig, positief geheel getal zijn" +}

1 0

Ricardo Filipe : cryptui: Add Portuguese translation.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: b219cbca7477bf49463727710935d8f15b793252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b219cbca7477bf49463727710… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Wed Jul 22 12:20:53 2009 -0700 cryptui: Add Portuguese translation. --- dlls/cryptui/Makefile.in | 3 +- dlls/cryptui/cryptui_Pt.rc | 465 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 467 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b219cbca7477bf4946372…

1 0

Frédéric Delanoy : jscript: Update French translation.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 47cbc3ae65f47a7c2d564caf642ec1ffb215e7a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47cbc3ae65f47a7c2d564caf6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 22 22:12:12 2009 +0200 jscript: Update French translation. --- dlls/jscript/jscript_Fr.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Fr.rc b/dlls/jscript/jscript_Fr.rc index 04d19ed..3d31d51 100644 --- a/dlls/jscript/jscript_Fr.rc +++ b/dlls/jscript/jscript_Fr.rc @@ -27,11 +27,14 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { + IDS_TO_PRIMITIVE "Erreur lors de la conversion de l'objet vers un type primitif" IDS_INVALID_CALL_ARG "Appel de procédure ou argument invalide" IDS_NO_PROPERTY "Cet objet ne supporte pas cette propriété ou méthode" IDS_ARG_NOT_OPT "Argument non optionnel" + IDS_NOT_FUNC "Fonction attendue" IDS_NOT_DATE "« [objet] » n'est pas un objet de type date" IDS_NOT_NUM "Nombre attendu" + IDS_UNDEFINED "« | » n'est pas défini" IDS_NOT_BOOL "Booléen attendu" IDS_INVALID_LENGTH "La longueur d'un tableau doit être un entier positif" }

1 0

André Hentschel : jscript: Update German translation.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 24eb52b44d11761700718e8b64781c0a18e80312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24eb52b44d11761700718e8b6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 22 18:59:59 2009 +0200 jscript: Update German translation. --- dlls/jscript/jscript_De.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_De.rc b/dlls/jscript/jscript_De.rc index 3eb27cc..2a265ab 100644 --- a/dlls/jscript/jscript_De.rc +++ b/dlls/jscript/jscript_De.rc @@ -24,11 +24,14 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { + IDS_TO_PRIMITIVE "Fehler beim umwandeln des Objektes in einen Grundtyp" IDS_INVALID_CALL_ARG "Ungültiger Funktionsaufruf oder Argument" IDS_NO_PROPERTY "Das Objekt unterstützt diese Eigenschaft oder Methode nicht" IDS_ARG_NOT_OPT "Argument nicht optional" + IDS_NOT_FUNC "Funktion erwarted" IDS_NOT_DATE "'[Objekt]' ist kein Datums-Objekt" IDS_NOT_NUM "Nummer erwartet" + IDS_UNDEFINED "'|' nicht definiert" IDS_NOT_BOOL "Boolisches Objekt erwartet" IDS_INVALID_LENGTH "Array-Größe muss eine endliche, positive Ganzzahl sein" }

1 0

Aurimas Fišeras : jscript: Update Lithuanian translation.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 91c3313fe40bb450cf5f5f5583dcd4efae02292a URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c3313fe40bb450cf5f5f558… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jul 22 17:55:11 2009 +0300 jscript: Update Lithuanian translation. --- dlls/jscript/jscript_Lt.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Lt.rc b/dlls/jscript/jscript_Lt.rc index f29ed63..787fa6c 100644 --- a/dlls/jscript/jscript_Lt.rc +++ b/dlls/jscript/jscript_Lt.rc @@ -25,11 +25,14 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { + IDS_TO_PRIMITIVE "Klaida keičiant objektą į primityvų tipą" IDS_INVALID_CALL_ARG "Netinkamas kreipinys į procedūrą ar argumentas" IDS_NO_PROPERTY "Objektas nepalaiko šios savybės ar metodo" IDS_ARG_NOT_OPT "Argumentas nėra neprivalomas" + IDS_NOT_FUNC "Tikėtasi funkcijos" IDS_NOT_DATE "„[objektas]“ nėra datos objektas" IDS_NOT_NUM "Tikėtasi skaičiaus" + IDS_UNDEFINED "„|“ yra neapibrėžtas" IDS_NOT_BOOL "Tikėtasi loginio objekto" IDS_INVALID_LENGTH "Masyvo dydis turi būti teigiamas sveikasis skaičius" }

1 0

Alexandre Julliard : shell32/tests: Create our own temp directory to make sure it's not the Windows directory.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 7db6d5e3be62b5303ebb17fe16168b1588390272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7db6d5e3be62b5303ebb17fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 23:25:25 2009 +0200 shell32/tests: Create our own temp directory to make sure it's not the Windows directory. --- dlls/shell32/tests/shlexec.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 6edc926..5f0776a 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -864,8 +864,7 @@ static void test_find_executable(void) ok(rc == SE_ERR_NOASSOC /* >= win2000 */ || rc > 32 /* win98, nt4 */, "FindExecutable(NULL) returned %ld\n", rc); ok(strcmp(command, "your word") != 0, "FindExecutable(NULL) returned command=[%s]\n", command); - /* Win95 can't cope with double backslashes in FindExecutableA (tmpdir has a trailing backslash) */ - sprintf(filename, "%stest file.sfe", tmpdir); + sprintf(filename, "%s\\test file.sfe", tmpdir); rc=(INT_PTR)FindExecutableA(filename, NULL, command); ok(rc > 32, "FindExecutable(%s) returned %ld\n", filename, rc); /* Depending on the platform, command could be '%1' or 'test file.sfe' */ @@ -911,10 +910,6 @@ static void test_find_executable(void) test=filename_tests; while (test->basename) { - /* Win95 can't cope with double slashes/backslashes in FindExecutableA */ - if (tmpdir[strlen(tmpdir) - 1] == '\\') - tmpdir[strlen(tmpdir) - 1] = 0; - sprintf(filename, test->basename, tmpdir); if (strchr(filename, '/')) { @@ -1527,8 +1522,13 @@ static void init_test(void) "unable to find argv0!\n"); } - GetTempPathA(sizeof(tmpdir)/sizeof(*tmpdir), tmpdir); - assert(GetTempFileNameA(tmpdir, "wt", 0, child_file)!=0); + GetTempPathA(sizeof(filename), filename); + GetTempFileNameA(filename, "wt", 0, tmpdir); + DeleteFileA( tmpdir ); + rc = CreateDirectoryA( tmpdir, NULL ); + ok( rc, "failed to create %s err %u\n", tmpdir, GetLastError() ); + rc = GetTempFileNameA(tmpdir, "wt", 0, child_file); + assert(rc != 0); init_event(child_file); /* Set up the test files */ @@ -1608,6 +1608,7 @@ static void cleanup_test(void) testfile++; } DeleteFile(child_file); + RemoveDirectoryA(tmpdir); /* Delete the test association */ delete_test_association(".shlexec");

1 0

Alexandre Julliard : mountmgr: Protect the device structures with a critical section.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 79de2e8126a194a517ab8d6e13dfc8a005f5b43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=79de2e8126a194a517ab8d6e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 21:13:00 2009 +0200 mountmgr: Protect the device structures with a critical section. --- dlls/mountmgr.sys/device.c | 66 ++++++++++++++++++++++++++++++++----------- 1 files changed, 49 insertions(+), 17 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index bdade97..03b1f89 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -89,6 +89,15 @@ static struct list volumes_list = LIST_INIT(volumes_list); static DRIVER_OBJECT *harddisk_driver; +static CRITICAL_SECTION device_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &device_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": device_section") } +}; +static CRITICAL_SECTION device_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + static char *get_dosdevices_path( char **drive ) { const char *config_dir = wine_get_config_dir(); @@ -650,37 +659,41 @@ NTSTATUS add_volume( const char *udi, const char *device, const char *mount_poin enum device_type type, const GUID *guid ) { struct volume *volume; - NTSTATUS status; + NTSTATUS status = STATUS_SUCCESS; TRACE( "adding %s device %s mount %s type %u uuid %s\n", debugstr_a(udi), debugstr_a(device), debugstr_a(mount_point), type, debugstr_guid(guid) ); + EnterCriticalSection( &device_section ); LIST_FOR_EACH_ENTRY( volume, &volumes_list, struct volume, entry ) if (volume->udi && !strcmp( udi, volume->udi )) goto found; /* udi not found, search for a non-dynamic volume */ - if ((volume = find_matching_volume( udi, device, mount_point, type ))) - { - set_volume_udi( volume, udi ); - } - else if ((status = create_volume( udi, type, &volume ))) return status; + if ((volume = find_matching_volume( udi, device, mount_point, type ))) set_volume_udi( volume, udi ); + else status = create_volume( udi, type, &volume ); found: - return set_volume_info( volume, NULL, device, mount_point, type, guid ); + if (!status) status = set_volume_info( volume, NULL, device, mount_point, type, guid ); + LeaveCriticalSection( &device_section ); + return status; } /* create a new disk volume */ NTSTATUS remove_volume( const char *udi ) { + NTSTATUS status = STATUS_NO_SUCH_DEVICE; struct volume *volume; + EnterCriticalSection( &device_section ); LIST_FOR_EACH_ENTRY( volume, &volumes_list, struct volume, entry ) { if (!volume->udi || strcmp( udi, volume->udi )) continue; set_volume_udi( volume, NULL ); - return STATUS_SUCCESS; + status = STATUS_SUCCESS; + break; } - return STATUS_NO_SUCH_DEVICE; + LeaveCriticalSection( &device_section ); + return status; } @@ -692,10 +705,14 @@ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, HKEY hkey; NTSTATUS status = STATUS_SUCCESS; struct dos_drive *drive, *next; - struct volume *volume = find_matching_volume( udi, device, mount_point, type ); + struct volume *volume; + int notify = -1; if (!(path = get_dosdevices_path( &p ))) return STATUS_NO_MEMORY; + EnterCriticalSection( &device_section ); + volume = find_matching_volume( udi, device, mount_point, type ); + if (letter == -1) /* auto-assign a letter */ { letter = add_drive( device, type ); @@ -756,20 +773,25 @@ found: RegCloseKey( hkey ); } - if (udi) send_notify( drive->drive, DBT_DEVICEARRIVAL ); + if (udi) notify = drive->drive; done: + LeaveCriticalSection( &device_section ); RtlFreeHeap( GetProcessHeap(), 0, path ); + if (notify != -1) send_notify( notify, DBT_DEVICEARRIVAL ); return status; } /* remove an existing dos drive, by letter or udi */ NTSTATUS remove_dos_device( int letter, const char *udi ) { + NTSTATUS status = STATUS_NO_SUCH_DEVICE; HKEY hkey; struct dos_drive *drive; char *path, *p; + int notify = -1; + EnterCriticalSection( &device_section ); LIST_FOR_EACH_ENTRY( drive, &drives_list, struct dos_drive, entry ) { if (udi) @@ -797,21 +819,25 @@ NTSTATUS remove_dos_device( int letter, const char *udi ) RegCloseKey( hkey ); } - if (udi && drive->volume->device->unix_mount) - send_notify( drive->drive, DBT_DEVICEREMOVECOMPLETE ); + if (udi && drive->volume->device->unix_mount) notify = drive->drive; delete_dos_device( drive ); - return STATUS_SUCCESS; + status = STATUS_SUCCESS; + break; } - return STATUS_NO_SUCH_DEVICE; + LeaveCriticalSection( &device_section ); + if (notify != -1) send_notify( notify, DBT_DEVICEREMOVECOMPLETE ); + return status; } /* query information about an existing dos drive, by letter or udi */ NTSTATUS query_dos_device( int letter, enum device_type *type, char **device, char **mount_point ) { + NTSTATUS status = STATUS_NO_SUCH_DEVICE; struct dos_drive *drive; struct disk_device *disk_device; + EnterCriticalSection( &device_section ); LIST_FOR_EACH_ENTRY( drive, &drives_list, struct dos_drive, entry ) { if (drive->drive != letter) continue; @@ -819,9 +845,11 @@ NTSTATUS query_dos_device( int letter, enum device_type *type, char **device, ch if (type) *type = disk_device->type; if (device) *device = strdupA( disk_device->unix_device ); if (mount_point) *mount_point = strdupA( disk_device->unix_mount ); - return STATUS_SUCCESS; + status = STATUS_SUCCESS; + break; } - return STATUS_NO_SUCH_DEVICE; + LeaveCriticalSection( &device_section ); + return status; } /* handler for ioctls on the harddisk device */ @@ -835,6 +863,8 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) irpsp->Parameters.DeviceIoControl.InputBufferLength, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + EnterCriticalSection( &device_section ); + switch(irpsp->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_DISK_GET_DRIVE_GEOMETRY: @@ -869,6 +899,8 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; break; } + + LeaveCriticalSection( &device_section ); return irp->IoStatus.u.Status; }

1 0

Alexandre Julliard : mountmgr: Return a copy of the strings in query_dos_device.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 134feaab05ae382aabc14aeb9268a6e68f035a38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=134feaab05ae382aabc14aeb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 21:02:47 2009 +0200 mountmgr: Return a copy of the strings in query_dos_device. --- dlls/mountmgr.sys/device.c | 7 +++---- dlls/mountmgr.sys/mountmgr.c | 10 +++++++--- dlls/mountmgr.sys/mountmgr.h | 3 +-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 20a7826..bdade97 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -807,8 +807,7 @@ NTSTATUS remove_dos_device( int letter, const char *udi ) } /* query information about an existing dos drive, by letter or udi */ -NTSTATUS query_dos_device( int letter, enum device_type *type, - const char **device, const char **mount_point ) +NTSTATUS query_dos_device( int letter, enum device_type *type, char **device, char **mount_point ) { struct dos_drive *drive; struct disk_device *disk_device; @@ -818,8 +817,8 @@ NTSTATUS query_dos_device( int letter, enum device_type *type, if (drive->drive != letter) continue; disk_device = drive->volume->device; if (type) *type = disk_device->type; - if (device) *device = disk_device->unix_device; - if (mount_point) *mount_point = disk_device->unix_mount; + if (device) *device = strdupA( disk_device->unix_device ); + if (mount_point) *mount_point = strdupA( disk_device->unix_mount ); return STATUS_SUCCESS; } return STATUS_NO_SUCH_DEVICE; diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index bbf5d64..a80d492 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -276,7 +276,7 @@ static NTSTATUS query_unix_drive( const void *in_buff, SIZE_T insize, { const struct mountmgr_unix_drive *input = in_buff; struct mountmgr_unix_drive *output = out_buff; - const char *device, *mount_point; + char *device, *mount_point; int letter = tolowerW( input->letter ); NTSTATUS status; DWORD size, type = DEVICE_UNKNOWN; @@ -314,7 +314,8 @@ static NTSTATUS query_unix_drive( const void *in_buff, SIZE_T insize, output->type = type; iosb->Information = FIELD_OFFSET( struct mountmgr_unix_drive, type ) + sizeof(output->type); } - return STATUS_MORE_ENTRIES; + status = STATUS_MORE_ENTRIES; + goto done; } output->size = size; output->letter = letter; @@ -341,7 +342,10 @@ static NTSTATUS query_unix_drive( const void *in_buff, SIZE_T insize, letter, debugstr_a(device), debugstr_a(mount_point), type ); iosb->Information = ptr - (char *)output; - return STATUS_SUCCESS; +done: + RtlFreeHeap( GetProcessHeap(), 0, device ); + RtlFreeHeap( GetProcessHeap(), 0, mount_point ); + return status; } /* handler for ioctls on the mount manager device */ diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index 0ba1086..3d57ba1 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -57,8 +57,7 @@ extern NTSTATUS remove_volume( const char *udi ); extern NTSTATUS add_dos_device( int letter, const char *udi, const char *device, const char *mount_point, enum device_type type, const GUID *guid ); extern NTSTATUS remove_dos_device( int letter, const char *udi ); -extern NTSTATUS query_dos_device( int letter, enum device_type *type, - const char **device, const char **mount_point ); +extern NTSTATUS query_dos_device( int letter, enum device_type *type, char **device, char **mount_point ); extern NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ); /* mount point functions */

1 0

Alexandre Julliard : mountmgr: Try to match and reuse volumes when creating /updating a drive.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 15acd35fa27d09af01698083af21ef3772edcae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15acd35fa27d09af01698083a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 20:56:04 2009 +0200 mountmgr: Try to match and reuse volumes when creating/updating a drive. --- dlls/mountmgr.sys/device.c | 104 +++++++++++++++++++++++++++++++++----------- 1 files changed, 78 insertions(+), 26 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 35797e4..20a7826 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -361,8 +361,8 @@ static NTSTATUS create_volume( const char *udi, enum device_type type, struct vo } /* create the disk device for a given volume */ -static NTSTATUS create_dos_device( const char *udi, int letter, enum device_type type, - struct dos_drive **drive_ret ) +static NTSTATUS create_dos_device( struct volume *volume, const char *udi, int letter, + enum device_type type, struct dos_drive **drive_ret ) { struct dos_drive *drive; NTSTATUS status; @@ -371,7 +371,15 @@ static NTSTATUS create_dos_device( const char *udi, int letter, enum device_type drive->drive = letter; drive->mount = NULL; - if (!(status = create_volume( udi, type, &drive->volume ))) + if (volume) + { + if (udi) set_volume_udi( volume, udi ); + drive->volume = volume; + status = STATUS_SUCCESS; + } + else status = create_volume( udi, type, &drive->volume ); + + if (status == STATUS_SUCCESS) { grab_volume( drive->volume ); list_add_tail( &drives_list, &drive->entry ); @@ -391,6 +399,31 @@ static void delete_dos_device( struct dos_drive *drive ) RtlFreeHeap( GetProcessHeap(), 0, drive ); } +/* find a volume that matches the parameters */ +static struct volume *find_matching_volume( const char *udi, const char *device, + const char *mount_point, enum device_type type ) +{ + struct volume *volume; + struct disk_device *disk_device; + + LIST_FOR_EACH_ENTRY( volume, &volumes_list, struct volume, entry ) + { + /* when we have a udi we only match drives added manually */ + if (udi && volume->udi) continue; + /* and when we don't have a udi we only match dynamic drives */ + if (!udi && !volume->udi) continue; + + disk_device = volume->device; + if (disk_device->type != type) continue; + if (device && disk_device->unix_device && strcmp( device, disk_device->unix_device )) continue; + if (mount_point && disk_device->unix_mount && strcmp( mount_point, disk_device->unix_mount )) continue; + TRACE( "found matching volume %s for device %s mount %s type %u\n", + debugstr_guid(&volume->guid), debugstr_a(device), debugstr_a(mount_point), type ); + return volume; + } + return NULL; +} + /* change the information for an existing volume */ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive, const char *device, const char *mount_point, enum device_type type, const GUID *guid ) @@ -424,7 +457,7 @@ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive, disk_device->unix_device = strdupA( device ); disk_device->unix_mount = strdupA( mount_point ); - if (memcmp( &volume->guid, guid, sizeof(volume->guid) )) + if (guid && memcmp( &volume->guid, guid, sizeof(volume->guid) )) { volume->guid = *guid; if (volume->mount) @@ -450,17 +483,23 @@ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive, return STATUS_SUCCESS; } -/* set or change the drive letter for an existing drive */ -static void set_drive_letter( struct dos_drive *drive, int letter ) +/* change the drive letter or volume for an existing drive */ +static void set_drive_info( struct dos_drive *drive, int letter, struct volume *volume ) { - struct volume *volume = drive->volume; - - if (drive->drive == letter) return; - if (drive->mount) delete_mount_point( drive->mount ); - if (volume->mount) delete_mount_point( volume->mount ); - drive->drive = letter; - drive->mount = NULL; - volume->mount = NULL; + if (drive->drive != letter) + { + if (drive->mount) delete_mount_point( drive->mount ); + drive->mount = NULL; + drive->drive = letter; + } + if (drive->volume != volume) + { + if (drive->mount) delete_mount_point( drive->mount ); + drive->mount = NULL; + grab_volume( volume ); + release_volume( drive->volume ); + drive->volume = volume; + } } static inline int is_valid_device( struct stat *st ) @@ -552,6 +591,7 @@ static void create_drive_devices(void) { char *path, *p, *link, *device; struct dos_drive *drive; + struct volume *volume; unsigned int i; HKEY drives_key; enum device_type drive_type; @@ -588,9 +628,12 @@ static void create_drive_devices(void) } } - if (!create_dos_device( NULL, i, drive_type, &drive )) + volume = find_matching_volume( NULL, device, link, drive_type ); + if (!create_dos_device( volume, NULL, i, drive_type, &drive )) { - set_volume_info( drive->volume, drive, device, link, drive_type, get_default_uuid(i) ); + /* don't reset uuid if we used an existing volume */ + const GUID *guid = volume ? NULL : get_default_uuid(i); + set_volume_info( drive->volume, drive, device, link, drive_type, guid ); } else { @@ -615,7 +658,12 @@ NTSTATUS add_volume( const char *udi, const char *device, const char *mount_poin LIST_FOR_EACH_ENTRY( volume, &volumes_list, struct volume, entry ) if (volume->udi && !strcmp( udi, volume->udi )) goto found; - if ((status = create_volume( udi, type, &volume ))) return status; + /* udi not found, search for a non-dynamic volume */ + if ((volume = find_matching_volume( udi, device, mount_point, type ))) + { + set_volume_udi( volume, udi ); + } + else if ((status = create_volume( udi, type, &volume ))) return status; found: return set_volume_info( volume, NULL, device, mount_point, type, guid ); @@ -644,6 +692,7 @@ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, HKEY hkey; NTSTATUS status = STATUS_SUCCESS; struct dos_drive *drive, *next; + struct volume *volume = find_matching_volume( udi, device, mount_point, type ); if (!(path = get_dosdevices_path( &p ))) return STATUS_NO_MEMORY; @@ -664,25 +713,28 @@ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, } else /* simply reset the device symlink */ { - *p = 'a' + letter; LIST_FOR_EACH_ENTRY( drive, &drives_list, struct dos_drive, entry ) + if (drive->drive == letter) break; + + *p = 'a' + letter; + if (&drive->entry == &drives_list) update_symlink( path, device, NULL ); + else { - if (drive->drive != letter) continue; update_symlink( path, device, drive->volume->device->unix_device ); - goto found; + delete_dos_device( drive ); } - update_symlink( path, device, NULL ); } - if ((status = create_dos_device( udi, letter, type, &drive ))) goto done; + if ((status = create_dos_device( volume, udi, letter, type, &drive ))) goto done; found: - if (!guid) guid = get_default_uuid( letter ); + if (!guid && !volume) guid = get_default_uuid( letter ); + if (!volume) volume = drive->volume; + set_drive_info( drive, letter, volume ); p[0] = 'a' + drive->drive; p[2] = 0; - update_symlink( path, mount_point, drive->volume->device->unix_mount ); - set_drive_letter( drive, letter ); - set_volume_info( drive->volume, drive, device, mount_point, type, guid ); + update_symlink( path, mount_point, volume->device->unix_mount ); + set_volume_info( volume, drive, device, mount_point, type, guid ); TRACE( "added device %c: udi %s for %s on %s type %u\n", 'a' + drive->drive, wine_dbgstr_a(udi), wine_dbgstr_a(device),

1 0

Alexandre Julliard : mountmgr: Add ref counting for volume objects.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 0da2e46eaf37049dea45133c904d37475a704193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da2e46eaf37049dea45133c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 20:55:24 2009 +0200 mountmgr: Add ref counting for volume objects. --- dlls/mountmgr.sys/device.c | 70 ++++++++++++++++++++++++++++++-------------- 1 files changed, 48 insertions(+), 22 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 3753c96..35797e4 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -71,6 +71,7 @@ struct volume struct list entry; /* entry in volumes list */ struct disk_device *device; /* disk device */ char *udi; /* unique identifier for dynamic volumes */ + unsigned int ref; /* ref count */ GUID guid; /* volume uuid */ struct mount_point *mount; /* Volume{xxx} mount point */ }; @@ -299,6 +300,46 @@ static void delete_disk_device( struct disk_device *device ) IoDeleteDevice( device->dev_obj ); } +/* grab another reference to a volume */ +static unsigned int grab_volume( struct volume *volume ) +{ + return ++volume->ref; +} + +/* release a volume and delete the corresponding disk device when refcount is 0 */ +static unsigned int release_volume( struct volume *volume ) +{ + unsigned int ret = --volume->ref; + + TRACE( "%s udi %s count now %u\n", debugstr_guid(&volume->guid), debugstr_a(volume->udi), ret ); + if (!ret) + { + assert( !volume->udi ); + list_remove( &volume->entry ); + if (volume->mount) delete_mount_point( volume->mount ); + delete_disk_device( volume->device ); + RtlFreeHeap( GetProcessHeap(), 0, volume ); + } + return ret; +} + +/* set the volume udi */ +static void set_volume_udi( struct volume *volume, const char *udi ) +{ + if (udi) + { + assert( !volume->udi ); + /* having a udi means the HAL side holds an extra reference */ + if ((volume->udi = strdupA( udi ))) grab_volume( volume ); + } + else if (volume->udi) + { + RtlFreeHeap( GetProcessHeap(), 0, volume->udi ); + volume->udi = NULL; + release_volume( volume ); + } +} + /* create a disk volume */ static NTSTATUS create_volume( const char *udi, enum device_type type, struct volume **volume_ret ) { @@ -308,32 +349,15 @@ static NTSTATUS create_volume( const char *udi, enum device_type type, struct vo if (!(volume = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*volume) ))) return STATUS_NO_MEMORY; - if (udi && !(volume->udi = strdupA( udi ))) - { - RtlFreeHeap( GetProcessHeap(), 0, volume ); - return STATUS_NO_MEMORY; - } if (!(status = create_disk_device( type, &volume->device ))) { + if (udi) set_volume_udi( volume, udi ); list_add_tail( &volumes_list, &volume->entry ); *volume_ret = volume; } - else - { - RtlFreeHeap( GetProcessHeap(), 0, volume->udi ); - RtlFreeHeap( GetProcessHeap(), 0, volume ); - } - return status; -} + else RtlFreeHeap( GetProcessHeap(), 0, volume ); -/* delete a volume and the corresponding disk device */ -static void delete_volume( struct volume *volume ) -{ - list_remove( &volume->entry ); - if (volume->mount) delete_mount_point( volume->mount ); - delete_disk_device( volume->device ); - RtlFreeHeap( GetProcessHeap(), 0, volume->udi ); - RtlFreeHeap( GetProcessHeap(), 0, volume ); + return status; } /* create the disk device for a given volume */ @@ -349,6 +373,7 @@ static NTSTATUS create_dos_device( const char *udi, int letter, enum device_type if (!(status = create_volume( udi, type, &drive->volume ))) { + grab_volume( drive->volume ); list_add_tail( &drives_list, &drive->entry ); *drive_ret = drive; } @@ -362,7 +387,7 @@ static void delete_dos_device( struct dos_drive *drive ) { list_remove( &drive->entry ); if (drive->mount) delete_mount_point( drive->mount ); - delete_volume( drive->volume ); + release_volume( drive->volume ); RtlFreeHeap( GetProcessHeap(), 0, drive ); } @@ -604,7 +629,7 @@ NTSTATUS remove_volume( const char *udi ) LIST_FOR_EACH_ENTRY( volume, &volumes_list, struct volume, entry ) { if (!volume->udi || strcmp( udi, volume->udi )) continue; - delete_volume( volume ); + set_volume_udi( volume, NULL ); return STATUS_SUCCESS; } return STATUS_NO_SUCH_DEVICE; @@ -699,6 +724,7 @@ NTSTATUS remove_dos_device( int letter, const char *udi ) { if (!drive->volume->udi) continue; if (strcmp( udi, drive->volume->udi )) continue; + set_volume_udi( drive->volume, NULL ); } else if (drive->drive != letter) continue;

1 0

Alexandre Julliard : mountmgr: Better reuse of existing devices.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 7b7ac02e1516effc47e1839299792b81ca3ffbd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7ac02e1516effc47e183929… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 19:21:22 2009 +0200 mountmgr: Better reuse of existing devices. --- dlls/mountmgr.sys/device.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 42eb0cd..3753c96 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -630,22 +630,23 @@ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, status = STATUS_OBJECT_NAME_COLLISION; goto done; } + + LIST_FOR_EACH_ENTRY_SAFE( drive, next, &drives_list, struct dos_drive, entry ) + { + if (drive->volume->udi && !strcmp( udi, drive->volume->udi )) goto found; + if (drive->drive == letter) delete_dos_device( drive ); + } } else /* simply reset the device symlink */ { *p = 'a' + letter; - update_symlink( path, device, NULL ); - } - - LIST_FOR_EACH_ENTRY_SAFE( drive, next, &drives_list, struct dos_drive, entry ) - { - if (udi && drive->volume->udi && !strcmp( udi, drive->volume->udi )) + LIST_FOR_EACH_ENTRY( drive, &drives_list, struct dos_drive, entry ) { - if (type == drive->volume->device->type) goto found; - delete_dos_device( drive ); - continue; + if (drive->drive != letter) continue; + update_symlink( path, device, drive->volume->device->unix_device ); + goto found; } - if (drive->drive == letter) delete_dos_device( drive ); + update_symlink( path, device, NULL ); } if ((status = create_dos_device( udi, letter, type, &drive ))) goto done;

1 0

Alexandre Julliard : mountmgr: Set the drive letter at creation time.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 968161e106a511e797400a6adfbed7dda8094d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=968161e106a511e797400a6ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 18:25:38 2009 +0200 mountmgr: Set the drive letter at creation time. --- dlls/mountmgr.sys/device.c | 53 ++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 672ef72..42eb0cd 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -337,13 +337,14 @@ static void delete_volume( struct volume *volume ) } /* create the disk device for a given volume */ -static NTSTATUS create_dos_device( const char *udi, enum device_type type, struct dos_drive **drive_ret ) +static NTSTATUS create_dos_device( const char *udi, int letter, enum device_type type, + struct dos_drive **drive_ret ) { struct dos_drive *drive; NTSTATUS status; if (!(drive = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*drive) ))) return STATUS_NO_MEMORY; - drive->drive = -1; + drive->drive = letter; drive->mount = NULL; if (!(status = create_volume( udi, type, &drive->volume ))) @@ -562,9 +563,8 @@ static void create_drive_devices(void) } } - if (!create_dos_device( NULL, drive_type, &drive )) + if (!create_dos_device( NULL, i, drive_type, &drive )) { - drive->drive = i; set_volume_info( drive->volume, drive, device, link, drive_type, get_default_uuid(i) ); } else @@ -616,6 +616,7 @@ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, const char *mount_point, enum device_type type, const GUID *guid ) { char *path, *p; + HKEY hkey; NTSTATUS status = STATUS_SUCCESS; struct dos_drive *drive, *next; @@ -647,7 +648,7 @@ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, if (drive->drive == letter) delete_dos_device( drive ); } - if ((status = create_dos_device( udi, type, &drive ))) goto done; + if ((status = create_dos_device( udi, letter, type, &drive ))) goto done; found: if (!guid) guid = get_default_uuid( letter ); @@ -657,32 +658,28 @@ found: set_drive_letter( drive, letter ); set_volume_info( drive->volume, drive, device, mount_point, type, guid ); - if (drive->drive != -1) - { - HKEY hkey; - - TRACE( "added device %c: udi %s for %s on %s type %u\n", - 'a' + drive->drive, wine_dbgstr_a(udi), wine_dbgstr_a(device), - wine_dbgstr_a(mount_point), type ); + TRACE( "added device %c: udi %s for %s on %s type %u\n", + 'a' + drive->drive, wine_dbgstr_a(udi), wine_dbgstr_a(device), + wine_dbgstr_a(mount_point), type ); - /* hack: force the drive type in the registry */ - if (!RegCreateKeyW( HKEY_LOCAL_MACHINE, drives_keyW, &hkey )) - { - const WCHAR *type_name = drive_types[type]; - WCHAR name[3] = {'a',':',0}; + /* hack: force the drive type in the registry */ + if (!RegCreateKeyW( HKEY_LOCAL_MACHINE, drives_keyW, &hkey )) + { + const WCHAR *type_name = drive_types[type]; + WCHAR name[3] = {'a',':',0}; + + name[0] += drive->drive; + if (!type_name[0] && type == DEVICE_HARDDISK) type_name = drive_types[DEVICE_FLOPPY]; + if (type_name[0]) + RegSetValueExW( hkey, name, 0, REG_SZ, (const BYTE *)type_name, + (strlenW(type_name) + 1) * sizeof(WCHAR) ); + else + RegDeleteValueW( hkey, name ); + RegCloseKey( hkey ); + } - name[0] += drive->drive; - if (!type_name[0] && type == DEVICE_HARDDISK) type_name = drive_types[DEVICE_FLOPPY]; - if (type_name[0]) - RegSetValueExW( hkey, name, 0, REG_SZ, (const BYTE *)type_name, - (strlenW(type_name) + 1) * sizeof(WCHAR) ); - else - RegDeleteValueW( hkey, name ); - RegCloseKey( hkey ); - } + if (udi) send_notify( drive->drive, DBT_DEVICEARRIVAL ); - if (udi) send_notify( drive->drive, DBT_DEVICEARRIVAL ); - } done: RtlFreeHeap( GetProcessHeap(), 0, path ); return status;

1 0

Alexandre Julliard : mountmgr: Use set_volume_info to update the volume when creating a new drive.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 6880b4d175d6076d8ababbddc6d0ef8433a2b51a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6880b4d175d6076d8ababbddc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 18:04:36 2009 +0200 mountmgr: Use set_volume_info to update the volume when creating a new drive. --- dlls/mountmgr.sys/device.c | 69 ++++++++++++------------------------------- 1 files changed, 19 insertions(+), 50 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index e0f9705..672ef72 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -427,24 +427,14 @@ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive, /* set or change the drive letter for an existing drive */ static void set_drive_letter( struct dos_drive *drive, int letter ) { - void *id = NULL; - unsigned int id_len = 0; struct volume *volume = drive->volume; - struct disk_device *device = volume->device; if (drive->drive == letter) return; if (drive->mount) delete_mount_point( drive->mount ); if (volume->mount) delete_mount_point( volume->mount ); drive->drive = letter; - drive->mount = add_dosdev_mount_point( device->dev_obj, &device->name, letter ); - volume->mount = add_volume_mount_point( device->dev_obj, &device->name, &volume->guid ); - if (device->unix_mount) - { - id = device->unix_mount; - id_len = strlen( device->unix_mount ) + 1; - } - if (drive->mount) set_mount_point_id( drive->mount, id, id_len ); - if (volume->mount) set_mount_point_id( volume->mount, id, id_len ); + drive->mount = NULL; + volume->mount = NULL; } static inline int is_valid_device( struct stat *st ) @@ -531,34 +521,6 @@ done: return drive; } -static void set_unix_mount_point( struct dos_drive *drive, const char *mount_point ) -{ - char *path, *p; - struct volume *volume = drive->volume; - struct disk_device *device = volume->device; - - if (!(path = get_dosdevices_path( &p ))) return; - p[0] = 'a' + drive->drive; - p[2] = 0; - update_symlink( path, mount_point, device->unix_mount ); - - RtlFreeHeap( GetProcessHeap(), 0, device->unix_mount ); - device->unix_mount = strdupA( mount_point ); - - if (mount_point && mount_point[0]) - { - if (drive->mount) set_mount_point_id( drive->mount, mount_point, strlen(mount_point) + 1 ); - if (volume->mount) set_mount_point_id( volume->mount, mount_point, strlen(mount_point) + 1 ); - } - else - { - if (drive->mount) set_mount_point_id( drive->mount, NULL, 0 ); - if (volume->mount) set_mount_point_id( volume->mount, NULL, 0 ); - } - - HeapFree( GetProcessHeap(), 0, path ); -} - /* create devices for mapped drives */ static void create_drive_devices(void) { @@ -653,18 +615,23 @@ NTSTATUS remove_volume( const char *udi ) NTSTATUS add_dos_device( int letter, const char *udi, const char *device, const char *mount_point, enum device_type type, const GUID *guid ) { + char *path, *p; + NTSTATUS status = STATUS_SUCCESS; struct dos_drive *drive, *next; + if (!(path = get_dosdevices_path( &p ))) return STATUS_NO_MEMORY; + if (letter == -1) /* auto-assign a letter */ { letter = add_drive( device, type ); - if (letter == -1) return STATUS_OBJECT_NAME_COLLISION; + if (letter == -1) + { + status = STATUS_OBJECT_NAME_COLLISION; + goto done; + } } else /* simply reset the device symlink */ { - char *path, *p; - - if (!(path = get_dosdevices_path( &p ))) return STATUS_NO_MEMORY; *p = 'a' + letter; update_symlink( path, device, NULL ); } @@ -680,15 +647,15 @@ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, if (drive->drive == letter) delete_dos_device( drive ); } - if (create_dos_device( udi, type, &drive )) return STATUS_NO_MEMORY; + if ((status = create_dos_device( udi, type, &drive ))) goto done; found: if (!guid) guid = get_default_uuid( letter ); - drive->volume->guid = *guid; - RtlFreeHeap( GetProcessHeap(), 0, drive->volume->device->unix_device ); - drive->volume->device->unix_device = strdupA( device ); + p[0] = 'a' + drive->drive; + p[2] = 0; + update_symlink( path, mount_point, drive->volume->device->unix_mount ); set_drive_letter( drive, letter ); - set_unix_mount_point( drive, mount_point ); + set_volume_info( drive->volume, drive, device, mount_point, type, guid ); if (drive->drive != -1) { @@ -716,7 +683,9 @@ found: if (udi) send_notify( drive->drive, DBT_DEVICEARRIVAL ); } - return STATUS_SUCCESS; +done: + RtlFreeHeap( GetProcessHeap(), 0, path ); + return status; } /* remove an existing dos drive, by letter or udi */

1 0

Alexandre Julliard : mountmgr: Add a helper function to update symlinks.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: e38aff419b3bc82547e9e7ae1404aee857437c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e38aff419b3bc82547e9e7ae1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 17:57:08 2009 +0200 mountmgr: Add a helper function to update symlinks. --- dlls/mountmgr.sys/device.c | 71 ++++++++++++++++++++++++------------------- 1 files changed, 40 insertions(+), 31 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 682808a..e0f9705 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -148,6 +148,20 @@ static char *read_symlink( const char *path ) } } +/* update a symlink if it changed; return TRUE if updated */ +static void update_symlink( const char *path, const char *dest, const char *orig_dest ) +{ + if (dest && dest[0]) + { + if (!orig_dest || strcmp( orig_dest, dest )) + { + unlink( path ); + symlink( dest, path ); + } + } + else unlink( path ); +} + /* send notification about a change to a given drive */ static void send_notify( int drive, int code ) { @@ -517,42 +531,32 @@ done: return drive; } -static BOOL set_unix_mount_point( struct dos_drive *drive, const char *mount_point ) +static void set_unix_mount_point( struct dos_drive *drive, const char *mount_point ) { char *path, *p; - BOOL modified = FALSE; struct volume *volume = drive->volume; struct disk_device *device = volume->device; - if (!(path = get_dosdevices_path( &p ))) return FALSE; + if (!(path = get_dosdevices_path( &p ))) return; p[0] = 'a' + drive->drive; p[2] = 0; + update_symlink( path, mount_point, device->unix_mount ); + + RtlFreeHeap( GetProcessHeap(), 0, device->unix_mount ); + device->unix_mount = strdupA( mount_point ); if (mount_point && mount_point[0]) { - /* try to avoid unlinking if already set correctly */ - if (!device->unix_mount || strcmp( device->unix_mount, mount_point )) - { - unlink( path ); - symlink( mount_point, path ); - modified = TRUE; - } - RtlFreeHeap( GetProcessHeap(), 0, device->unix_mount ); - device->unix_mount = strdupA( mount_point ); if (drive->mount) set_mount_point_id( drive->mount, mount_point, strlen(mount_point) + 1 ); if (volume->mount) set_mount_point_id( volume->mount, mount_point, strlen(mount_point) + 1 ); } else { - if (unlink( path ) != -1) modified = TRUE; - RtlFreeHeap( GetProcessHeap(), 0, device->unix_mount ); - device->unix_mount = NULL; if (drive->mount) set_mount_point_id( drive->mount, NULL, 0 ); if (volume->mount) set_mount_point_id( volume->mount, NULL, 0 ); } HeapFree( GetProcessHeap(), 0, path ); - return modified; } /* create devices for mapped drives */ @@ -662,8 +666,7 @@ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, if (!(path = get_dosdevices_path( &p ))) return STATUS_NO_MEMORY; *p = 'a' + letter; - unlink( path ); - if (device) symlink( device, path ); + update_symlink( path, device, NULL ); } LIST_FOR_EACH_ENTRY_SAFE( drive, next, &drives_list, struct dos_drive, entry ) @@ -721,31 +724,37 @@ NTSTATUS remove_dos_device( int letter, const char *udi ) { HKEY hkey; struct dos_drive *drive; + char *path, *p; LIST_FOR_EACH_ENTRY( drive, &drives_list, struct dos_drive, entry ) { - if (letter != -1 && drive->drive != letter) continue; if (udi) { if (!drive->volume->udi) continue; if (strcmp( udi, drive->volume->udi )) continue; } + else if (drive->drive != letter) continue; - if (drive->drive != -1) + if ((path = get_dosdevices_path( &p ))) { - BOOL modified = set_unix_mount_point( drive, NULL ); - - /* clear the registry key too */ - if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, drives_keyW, &hkey )) - { - WCHAR name[3] = {'a',':',0}; - name[0] += drive->drive; - RegDeleteValueW( hkey, name ); - RegCloseKey( hkey ); - } + p[0] = 'a' + drive->drive; + p[2] = 0; + unlink( path ); + RtlFreeHeap( GetProcessHeap(), 0, path ); + } - if (modified && udi) send_notify( drive->drive, DBT_DEVICEREMOVECOMPLETE ); + /* clear the registry key too */ + if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, drives_keyW, &hkey )) + { + WCHAR name[3] = {'a',':',0}; + name[0] += drive->drive; + RegDeleteValueW( hkey, name ); + RegCloseKey( hkey ); } + + if (udi && drive->volume->device->unix_mount) + send_notify( drive->drive, DBT_DEVICEREMOVECOMPLETE ); + delete_dos_device( drive ); return STATUS_SUCCESS; }

1 0

Alexandre Julliard : mountmgr: Optionally update the drive mount point in set_volume_info.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 878459383a28e534d99bfaf3f32fd7c8d78a194c URL: http://source.winehq.org/git/wine.git/?a=commit;h=878459383a28e534d99bfaf3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 17:49:39 2009 +0200 mountmgr: Optionally update the drive mount point in set_volume_info. --- dlls/mountmgr.sys/device.c | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 7b235ec..682808a 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -352,9 +352,11 @@ static void delete_dos_device( struct dos_drive *drive ) } /* change the information for an existing volume */ -static NTSTATUS set_volume_info( struct volume *volume, const char *device, const char *mount_point, - enum device_type type, const GUID *guid ) +static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive, const char *device, + const char *mount_point, enum device_type type, const GUID *guid ) { + void *id = NULL; + unsigned int id_len = 0; struct disk_device *disk_device = volume->device; NTSTATUS status; @@ -366,6 +368,11 @@ static NTSTATUS set_volume_info( struct volume *volume, const char *device, cons delete_mount_point( volume->mount ); volume->mount = NULL; } + if (drive && drive->mount) + { + delete_mount_point( drive->mount ); + drive->mount = NULL; + } delete_disk_device( volume->device ); volume->device = disk_device; } @@ -389,19 +396,17 @@ static NTSTATUS set_volume_info( struct volume *volume, const char *device, cons if (!volume->mount) volume->mount = add_volume_mount_point( disk_device->dev_obj, &disk_device->name, &volume->guid ); + if (drive && !drive->mount) + drive->mount = add_dosdev_mount_point( disk_device->dev_obj, &disk_device->name, drive->drive ); - if (volume->mount) + if (disk_device->unix_mount) { - void *id = NULL; - unsigned int id_len = 0; - - if (disk_device->unix_mount) - { - id = disk_device->unix_mount; - id_len = strlen( disk_device->unix_mount ) + 1; - } - set_mount_point_id( volume->mount, id, id_len ); + id = disk_device->unix_mount; + id_len = strlen( disk_device->unix_mount ) + 1; } + if (volume->mount) set_mount_point_id( volume->mount, id, id_len ); + if (drive && drive->mount) set_mount_point_id( drive->mount, id, id_len ); + return STATUS_SUCCESS; } @@ -593,10 +598,8 @@ static void create_drive_devices(void) if (!create_dos_device( NULL, drive_type, &drive )) { - drive->volume->device->unix_mount = link; - drive->volume->device->unix_device = device; - drive->volume->guid = *get_default_uuid( i ); - set_drive_letter( drive, i ); + drive->drive = i; + set_volume_info( drive->volume, drive, device, link, drive_type, get_default_uuid(i) ); } else { @@ -624,7 +627,7 @@ NTSTATUS add_volume( const char *udi, const char *device, const char *mount_poin if ((status = create_volume( udi, type, &volume ))) return status; found: - return set_volume_info( volume, device, mount_point, type, guid ); + return set_volume_info( volume, NULL, device, mount_point, type, guid ); } /* create a new disk volume */

1 0

Alexandre Julliard : mountmgr: Rename the DOS drive mount field for symmetry with the volume structure.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 86fdd8ebc54afdd8683550eca08287944db12599 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86fdd8ebc54afdd8683550eca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 17:46:02 2009 +0200 mountmgr: Rename the DOS drive mount field for symmetry with the volume structure. --- dlls/mountmgr.sys/device.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index efbbb33..7b235ec 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -80,7 +80,7 @@ struct dos_drive struct list entry; /* entry in drives list */ struct volume *volume; /* volume for this drive */ int drive; /* drive letter (0 = A: etc.) */ - struct mount_point *dosdev; /* DosDevices mount point */ + struct mount_point *mount; /* DosDevices mount point */ }; static struct list drives_list = LIST_INIT(drives_list); @@ -329,8 +329,8 @@ static NTSTATUS create_dos_device( const char *udi, enum device_type type, struc NTSTATUS status; if (!(drive = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*drive) ))) return STATUS_NO_MEMORY; - drive->drive = -1; - drive->dosdev = NULL; + drive->drive = -1; + drive->mount = NULL; if (!(status = create_volume( udi, type, &drive->volume ))) { @@ -346,7 +346,7 @@ static NTSTATUS create_dos_device( const char *udi, enum device_type type, struc static void delete_dos_device( struct dos_drive *drive ) { list_remove( &drive->entry ); - if (drive->dosdev) delete_mount_point( drive->dosdev ); + if (drive->mount) delete_mount_point( drive->mount ); delete_volume( drive->volume ); RtlFreeHeap( GetProcessHeap(), 0, drive ); } @@ -414,17 +414,17 @@ static void set_drive_letter( struct dos_drive *drive, int letter ) struct disk_device *device = volume->device; if (drive->drive == letter) return; - if (drive->dosdev) delete_mount_point( drive->dosdev ); + if (drive->mount) delete_mount_point( drive->mount ); if (volume->mount) delete_mount_point( volume->mount ); drive->drive = letter; - drive->dosdev = add_dosdev_mount_point( device->dev_obj, &device->name, letter ); + drive->mount = add_dosdev_mount_point( device->dev_obj, &device->name, letter ); volume->mount = add_volume_mount_point( device->dev_obj, &device->name, &volume->guid ); if (device->unix_mount) { id = device->unix_mount; id_len = strlen( device->unix_mount ) + 1; } - if (drive->dosdev) set_mount_point_id( drive->dosdev, id, id_len ); + if (drive->mount) set_mount_point_id( drive->mount, id, id_len ); if (volume->mount) set_mount_point_id( volume->mount, id, id_len ); } @@ -534,7 +534,7 @@ static BOOL set_unix_mount_point( struct dos_drive *drive, const char *mount_poi } RtlFreeHeap( GetProcessHeap(), 0, device->unix_mount ); device->unix_mount = strdupA( mount_point ); - if (drive->dosdev) set_mount_point_id( drive->dosdev, mount_point, strlen(mount_point) + 1 ); + if (drive->mount) set_mount_point_id( drive->mount, mount_point, strlen(mount_point) + 1 ); if (volume->mount) set_mount_point_id( volume->mount, mount_point, strlen(mount_point) + 1 ); } else @@ -542,7 +542,7 @@ static BOOL set_unix_mount_point( struct dos_drive *drive, const char *mount_poi if (unlink( path ) != -1) modified = TRUE; RtlFreeHeap( GetProcessHeap(), 0, device->unix_mount ); device->unix_mount = NULL; - if (drive->dosdev) set_mount_point_id( drive->dosdev, NULL, 0 ); + if (drive->mount) set_mount_point_id( drive->mount, NULL, 0 ); if (volume->mount) set_mount_point_id( volume->mount, NULL, 0 ); }

1 0

Alexandre Julliard : transl: Use the array form for spawning shell commands .
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: tools Branch: master Commit: f6931374185da7ba6c5ee68e837095b2c2f84d10 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f6931374185da7ba6c5ee68e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 23 13:19:34 2009 +0200 transl: Use the array form for spawning shell commands. --- transl/scripts/checkmakefile.pl | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index ae964f0..2c31607 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -10,13 +10,12 @@ use File::Basename; # configuration parameters my (%CONFIG, $srcdir, $objdir, $toolsdir, $workdir, $wrc); -sub shell($) +sub shell(@) { - my $cmd = shift; - my $ret = system $cmd; + my $ret = system @_; if ($ret) { - print STDERR "$cmd\n"; + print STDERR join(" ", @_) . "\n"; print "!!!!!!! return value: $ret\n"; exit 1; } @@ -66,21 +65,21 @@ sub mycheck } return unless @rcfiles; - # files in dlls/ are compiled with __WINESRC__ - $defs .= " -D__WINESRC__" if ($dir =~ m,^dlls,); + # files in dlls/ are compiled with __WINESRC__ + my @defs = split /s+/, $defs; + push @defs, "-D__WINESRC__" if ($dir =~ m,^dlls,); - print STDERR "*** $dir [$defs]\n"; + printf STDERR "*** $dir [%s]\n", join( " ", @defs ); - my $incl = "-I$srcdir/$dir -I$objdir/$dir -I$srcdir/include -I$objdir/include"; + my @incl = ("-I$srcdir/$dir", "-I$objdir/$dir", "-I$srcdir/include", "-I$objdir/include"); my $norm_fn = $dir; $norm_fn =~ s/[^a-zA-Z0-9]/-/g; - my $targets = join( " ", map { (my $ret = $_) =~ s/.rc$/.res/; $ret; } @rcfiles ); - my $srcs = join( " ", @srcs ); - my $objs = join( " ", map { (my $ret = "$objdir/$dir/$_") =~ s/.rc$/.res/; $ret; } @rcfiles ); + my @targets = map { (my $ret = $_) =~ s/.rc$/.res/; $ret; } @rcfiles; + my @objs = map { (my $ret = "$objdir/$dir/$_") =~ s/.rc$/.res/; $ret; } @rcfiles; - shell "make -C $objdir/$dir -s $targets"; - shell "$toolsdir/tools/winebuild/winebuild --resources -o $workdir/res/$norm_fn.res $objs"; + shell "make", "-C", "$objdir/$dir", "-s", @targets; + shell "$toolsdir/tools/winebuild/winebuild", "--resources", "-o", "$workdir/res/$norm_fn.res", @objs; my $type = -1; my $resource; @@ -99,7 +98,7 @@ sub mycheck if ($mode eq "locale") { - open(VERIFY, "$wrc $incl --verify-translation $defs $srcs|"); + open VERIFY, "-|" or exec $wrc, "--verify-translation", @incl, @defs, @srcs; while (<VERIFY>) { if (m/^EXIST ([0-9a-f]{3}:[0-9a-f]{2})/) @@ -116,7 +115,7 @@ sub mycheck return; } - open(VERIFY, "$wrc $incl --verify-translation $defs $srcs|"); + open VERIFY, "-|" or exec $wrc, "--verify-translation", @incl, @defs, @srcs; while (<VERIFY>) { if (m/^TYPE NEXT/)

1 0

Alexandre Julliard : transl: Store all output data in a single directory.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: tools Branch: master Commit: 6060307e9768c1f1b6126cbbe3cf3b43b1d938f5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6060307e9768c1f1b6126cbb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 23 12:44:21 2009 +0200 transl: Store all output data in a single directory. --- transl/.gitignore | 3 +-- transl/php/config.php | 2 +- transl/php/index.php | 4 ++-- transl/php/lang.php | 4 ++-- transl/php/lib.php | 5 +++-- transl/php/resfile.php | 2 +- transl/php/runlog.php | 4 ++-- transl/scripts/Master.sh | 21 ++++++++------------- transl/scripts/checkmakefile.pl | 12 ++++++------ winetest/make-winetest | 15 ++++++--------- 10 files changed, 32 insertions(+), 40 deletions(-) diff --git a/transl/.gitignore b/transl/.gitignore index 9e6aaf8..3be2009 100644 --- a/transl/.gitignore +++ b/transl/.gitignore @@ -2,5 +2,4 @@ /scripts/config /scripts/local-posthook.sh /scripts/local-prehook.sh -/php/dumps -/php/langs \ No newline at end of file +/php/data diff --git a/transl/php/config.php b/transl/php/config.php index 1d5f276..eb14c09 100644 --- a/transl/php/config.php +++ b/transl/php/config.php @@ -1,5 +1,5 @@ <?php -$DATAROOT = "."; +$DATAROOT = "data"; $TITLE_APPENDIX = " - Wine 1.1.x"; $TITLE_DESCR = "This page shows the translation status of the most recent Wine 1.1.x. To see the Wine 1.0.x line see <a href=\"http://www.mikolaj.zalewski.pl/wine-transl/1.0.x/\">here</a>"; ?> diff --git a/transl/php/index.php b/transl/php/index.php index 904fc47..5a1772e 100644 --- a/transl/php/index.php +++ b/transl/php/index.php @@ -2,7 +2,7 @@ include_once("config.php"); include_once("lib.php"); -$summary = fopen("$DATAROOT/langs/summary", "r"); +$summary = fopen("$DATAROOT/summary", "r"); $transl = array(); $sum = 0; while ($line = fgets($summary, 1024)) @@ -118,7 +118,7 @@ for ($i = 0; $i < count($transl); $i++) </div> </div> <?php -if ($time = filemtime("$DATAROOT/langs/summary")) +if ($time = filemtime("$DATAROOT/summary")) { echo "<p><small>Generated on ".gmdate("j M Y, G:i:s T", $time)." (see <a href=\"runlog.php\">run log</a>)</small></p>"; } diff --git a/transl/php/lang.php b/transl/php/lang.php index 21b2dea..9f36d0c 100644 --- a/transl/php/lang.php +++ b/transl/php/lang.php @@ -12,10 +12,10 @@ function parse_file($lang) { global $transl, $partial, $notransl; global $DATAROOT; - if (!file_exists("$DATAROOT/langs/$lang")) + if (!file_exists("$DATAROOT/$lang")) return; - $file = fopen("$DATAROOT/langs/$lang", "r"); + $file = fopen("$DATAROOT/$lang", "r"); $curr_file = ""; while ($line = fgets($file, 4096)) { diff --git a/transl/php/lib.php b/transl/php/lib.php index 1499d7b..8d23291 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -47,13 +47,14 @@ function res_enum($header, $f) function enum_locale_names() { include_once "lib_res.php"; + include "config.php"; global $LOCALE_NAMES; if (!empty($LOCALE_NAMES)) { return; } - $res = new ResFile("dumps/res/dlls-kernel32.res"); + $res = new ResFile("$DATAROOT/res/dlls-kernel32.res"); $res->enumResources("res_enum"); ksort($LOCALE_NAMES); } @@ -160,7 +161,7 @@ function get_res_path($resfile) global $DATAROOT; $resfile = preg_replace("/\\.rc(#.*)?$/", "", $resfile); - return "$DATAROOT/dumps/res/".preg_replace("/[^a-zA-Z0-9]/", "-", $resfile).".res"; + return "$DATAROOT/res/".preg_replace("/[^a-zA-Z0-9]/", "-", $resfile).".res"; } function get_resfile_name($resfile) diff --git a/transl/php/resfile.php b/transl/php/resfile.php index 45bae3a..4fcd2d7 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -29,7 +29,7 @@ if (preg_match("/:00/", $lang)) exit(); } -$file = fopen("$DATAROOT/langs/$lang", "r"); +$file = fopen("$DATAROOT/$lang", "r"); while ($line = fgets($file, 4096)) { if (preg_match("@$resfile: (.*)@", $line, $m)) diff --git a/transl/php/runlog.php b/transl/php/runlog.php index f6e0591..ac4bbaa 100644 --- a/transl/php/runlog.php +++ b/transl/php/runlog.php @@ -2,6 +2,6 @@ include("config.php"); header("Content-type: text/plain"); -$f = fopen("$DATAROOT/dumps/run.log", "r"); +$f = fopen("$DATAROOT/run.log", "r"); fpassthru($f); -?> \ No newline at end of file +?> diff --git a/transl/scripts/Master.sh b/transl/scripts/Master.sh index 4a0df39..0baa873 100755 --- a/transl/scripts/Master.sh +++ b/transl/scripts/Master.sh @@ -39,28 +39,23 @@ if [ "$PREPARE_TREES" -eq 1 ]; then fi # Do cleanup for new run -rm -Rf $WORKDIR/langs -rm -Rf $WORKDIR/dumps -mkdir $WORKDIR/langs -mkdir $WORKDIR/dumps -mkdir $WORKDIR/dumps/res +rm -Rf $WORKDIR/data +mkdir $WORKDIR/data +mkdir $WORKDIR/data/res # Analyze all the Makefiles -$SCRIPTSDIR/checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -w "$WORKDIR" 2>>"$WORKDIR/run.log" || exit +./checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -w "$WORKDIR/data" 2>>"$WORKDIR/run.log" || exit # Show any changes in the log diff -u $WORKDIR/run.log.old $WORKDIR/run.log # Copy the new data from the working directory to the PHP scripts input -mv -f $DESTDIR/langs $DESTDIR/langs.old -mv -f $DESTDIR/dumps $DESTDIR/dumps.old -mv -f $WORKDIR/langs $DESTDIR/langs -mv -f $WORKDIR/dumps $DESTDIR/dumps -cp -f $WORKDIR/run.log $DESTDIR/dumps/run.log +mv -f $DESTDIR/data $DESTDIR/data.old +mv -f $WORKDIR/data $DESTDIR/data +cp -f $WORKDIR/run.log $DESTDIR/data/run.log # Deleting can take a bit longer so we do it after the new version is set up -rm -Rf $DESTDIR/langs.old -rm -Rf $DESTDIR/dumps.old +rm -Rf $DESTDIR/data.old # Optional hooks if [ -x ./local-posthook.sh ]; then diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index 66a0909..ae964f0 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -80,7 +80,7 @@ sub mycheck my $objs = join( " ", map { (my $ret = "$objdir/$dir/$_") =~ s/.rc$/.res/; $ret; } @rcfiles ); shell "make -C $objdir/$dir -s $targets"; - shell "$toolsdir/tools/winebuild/winebuild --resources -o $workdir/dumps/res/$norm_fn.res $objs"; + shell "$toolsdir/tools/winebuild/winebuild --resources -o $workdir/res/$norm_fn.res $objs"; my $type = -1; my $resource; @@ -263,7 +263,7 @@ sub mycheck next if (($lang eq "009:01") && ($transl_count{$lang} == 0)); - open(LANGOUT, ">>$workdir/langs/$lang"); + open(LANGOUT, ">>$workdir/$lang"); print LANGOUT "FILE STAT $dir ".($transl_count{$lang}+0)." ".($missing_count{$lang}+0)." ".($err_count{$lang}+0)."\n"; foreach my $warn (@{$warns{$lang}}) @@ -297,7 +297,7 @@ sub mycheck my @transl = grep {$_ eq $lang} keys %file_langs; if ($#transl == -1) { - open(LANGOUT, ">>$workdir/langs/$lang"); + open(LANGOUT, ">>$workdir/$lang"); print LANGOUT "FILE NONE $dir 0 ".$transl_count{"009:01"}." 0\n"; close(LANGOUT); } @@ -344,7 +344,7 @@ while (@ARGV && $ARGV[0] =~ /^-/) $srcdir ||= $CONFIG{"SOURCEROOT"}; $objdir ||= $CONFIG{"BUILDROOT"} || $srcdir; $toolsdir ||= $CONFIG{"WRCROOT"} || $objdir; -$workdir ||= $CONFIG{"WORKDIR"}; +$workdir ||= $CONFIG{"WORKDIR"} . "/data"; $wrc = $toolsdir . "/tools/wrc/wrc"; if ($srcdir eq "" || $wrc eq "/tools/wrc/wrc" || $workdir eq "") @@ -427,13 +427,13 @@ foreach my $path (keys %checks) } # create the summary file -open(OUT, ">$workdir/langs/summary"); +open(OUT, ">$workdir/summary"); foreach my $lang (keys %languages) { my $transl = 0; my $missing = 0; my $errors = 0; - open(FILE, "<$workdir/langs/$lang"); + open(FILE, "<$workdir/$lang"); while (<FILE>) { if (m/^FILE [A-Z]+ .* ([0-9]+) ([0-9]+) ([0-9]+)$/) { diff --git a/winetest/make-winetest b/winetest/make-winetest index 50903f6..2521b28 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -130,15 +130,12 @@ umask 022 # update the translations status - rm -rf work - mkdir work work/langs work/dumps work/dumps/res - $toolsdir/transl/scripts/checkmakefile.pl -S ./wine -T ./build-mingw -t ./build-native -w ./work 2>>work/run.log - mv -f $transldir/langs $transldir/langs.old - mv -f $transldir/dumps $transldir/dumps.old - mv -f work/langs $transldir/langs - mv -f work/dumps $transldir/dumps - mv -f work/run.log $transldir/dumps/run.log - rm -rf $transldir/langs.old $transldir/dumps.old + rm -rf data + mkdir data data/res + $toolsdir/transl/scripts/checkmakefile.pl -S ./wine -T ./build-mingw -t ./build-native -w ./data 2>>data/run.log + mv -f $transldir/data $transldir/data.old + mv -f data $transldir/data + rm -rf $transldir/data.old echo "translations updated"

1 0

Alexandre Julliard : transl: Don' t try to open the language file for neutral languages.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: tools Branch: master Commit: b79864dddd6c089a4cd77c8d2c705faf0b900091 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b79864dddd6c089a4cd77c8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 23 12:40:14 2009 +0200 transl: Don't try to open the language file for neutral languages. --- transl/php/resfile.php | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/transl/php/resfile.php b/transl/php/resfile.php index 13bfd63..45bae3a 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -5,7 +5,6 @@ include("lib.php"); $lang = validate_lang($_REQUEST['lang']); $resfile = validate_resfile($_REQUEST['resfile']); -$file = fopen("$DATAROOT/langs/$lang", "r"); $msgs = array(); ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> @@ -22,6 +21,15 @@ $msgs = array(); <?php +if (preg_match("/:00/", $lang)) +{ + echo "<div class=\"contents\">"; + show_sublangs($lang); + echo "</div>"; + exit(); +} + +$file = fopen("$DATAROOT/langs/$lang", "r"); while ($line = fgets($file, 4096)) { if (preg_match("@$resfile: (.*)@", $line, $m)) @@ -32,12 +40,6 @@ while ($line = fgets($file, 4096)) if (count($msgs) == 0) { - if (preg_match("/:00/", $lang)) - { - show_sublangs($lang); - exit(); - } - echo "<div class=\"contents\">"; echo "<p>This module is not translated into ".get_lang_name($lang).".</p>\n"; echo "<ul><li>If you want to see what resources are in this module, check the "

1 0

Paul Vriens : transl: Some HTML markup fixes.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: tools Branch: master Commit: e24cc38b0e0ad8efc68cb3379967edd8dae924b5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e24cc38b0e0ad8efc68cb337… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 23 11:01:35 2009 +0200 transl: Some HTML markup fixes. --- transl/php/lib.php | 7 ++++--- transl/php/resfile.php | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index 48ea48b..1499d7b 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -227,16 +227,17 @@ function gen_lang_a($lang) function gen_resfile_a($lang, $resfile) { - return "<a href=\"resfile.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile)."\">"; + return "<a href=\"resfile.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile)."\">"; } function gen_resource_a($lang, $resfile, $type, $id, $compare=FALSE) { if ($compare) - $extra = "&compare="; + $extra = "&compare="; else $extra = ""; - return "<a href=\"resource.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile)."&type=".urlencode($type)."&id=".urlencode($id)."$extra\">"; + return "<a href=\"resource.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile). + "&type=".urlencode($type)."&id=".urlencode($id)."$extra\">"; } function dump_menu_root() diff --git a/transl/php/resfile.php b/transl/php/resfile.php index c53ad5a..13bfd63 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -102,6 +102,7 @@ foreach ($msgs as $value) echo "</td><td>".$value."</td></tr>\n"; } +echo "</table>\n"; ?> </div> </html>

1 0

Paul Vriens : transl: Use a correct link for the 1.0.x translation status.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: tools Branch: master Commit: 70699a0d5ed8641b2de7f297c2baf53a99062de7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=70699a0d5ed8641b2de7f297… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 23 09:39:24 2009 +0200 transl: Use a correct link for the 1.0.x translation status. --- transl/php/config.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/transl/php/config.php b/transl/php/config.php index bb6c73b..1d5f276 100644 --- a/transl/php/config.php +++ b/transl/php/config.php @@ -1,5 +1,5 @@ <?php $DATAROOT = "."; $TITLE_APPENDIX = " - Wine 1.1.x"; -$TITLE_DESCR = "This page shows the translation status of the most recent Wine 1.1.x. To see the Wine 1.0.x line see <a href=\"http://pf128.krakow.sdi.tpnet.pl/wine-transl/\">here</a>"; -?> \ No newline at end of file +$TITLE_DESCR = "This page shows the translation status of the most recent Wine 1.1.x. To see the Wine 1.0.x line see <a href=\"http://www.mikolaj.zalewski.pl/wine-transl/1.0.x/\">here</a>"; +?>

1 0

Paul Vriens : transl: Don't show English(US) as a sublanguage of English( Neutral).
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: tools Branch: master Commit: d146316c353e706d6d7ada2ad12335eeb990f9e8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d146316c353e706d6d7ada2a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 23 09:33:30 2009 +0200 transl: Don't show English(US) as a sublanguage of English(Neutral). --- transl/php/lib.php | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index b293ec2..48ea48b 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -105,14 +105,16 @@ function get_sublangs($id) { if (preg_match("/:00/", $id)) { + global $MASTER_LANGUAGE; global $LOCALE_NAMES; enum_locale_names(); $base = preg_replace("/:00/", "", $id); $sublangs = array(); foreach ($LOCALE_NAMES as $key => $value) - if (preg_match("/$base/", $key) && ($key != $id)) - $sublangs[] = $key; + if (preg_match("/$base/", $key) && ($key != $id) && ($key != $MASTER_LANGUAGE)) + $sublangs[$key] = $value; + asort($sublangs); return $sublangs; } else @@ -131,7 +133,7 @@ function show_sublangs($id) echo "<table>\n"; echo "<tr><th>Sublanguage</th></tr>\n"; $sublangs = get_sublangs($id); - foreach ($sublangs as $key) + foreach ($sublangs as $key => $value) { echo "<tr><td>".gen_lang_a($key).get_lang_name($key)."</a></td></tr>"; }

1 0

Paul Vriens : transl: Don't use hardcoded language identifier.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: tools Branch: master Commit: 885fa85a922cc599d24913e6df6e6b50b631f23b URL: http://source.winehq.org/git/tools.git/?a=commit;h=885fa85a922cc599d24913e6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 23 09:24:09 2009 +0200 transl: Don't use hardcoded language identifier. --- transl/php/index.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/transl/php/index.php b/transl/php/index.php index 4e37347..904fc47 100644 --- a/transl/php/index.php +++ b/transl/php/index.php @@ -65,13 +65,14 @@ function draw_bar($tr, $err, $sum) function nicesort($a, $b) { + global $MASTER_LANGUAGE; if ($a['translated'] != $b['translated']) return ($a['translated'] < $b['translated']); // English (Unites States) always on top - if ($a['langid'] == "009:01") + if ($a['langid'] == $MASTER_LANGUAGE) return 0; - if ($b['langid'] == "009:01") + if ($b['langid'] == $MASTER_LANGUAGE) return 1; return strcasecmp($a['name'], $b['name']); }

1 0

Paul Vriens : transl: Add a margin to the contents of a text box.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: tools Branch: master Commit: 2a5b9f710d06f9e713ee8412821d44311ac23438 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2a5b9f710d06f9e713ee8412… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 23 09:20:06 2009 +0200 transl: Add a margin to the contents of a text box. --- transl/php/resfile.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/transl/php/resfile.php b/transl/php/resfile.php index 6145752..c53ad5a 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -38,6 +38,7 @@ if (count($msgs) == 0) exit(); } + echo "<div class=\"contents\">"; echo "<p>This module is not translated into ".get_lang_name($lang).".</p>\n"; echo "<ul><li>If you want to see what resources are in this module, check the " .gen_resfile_a($MASTER_LANGUAGE, $resfile).get_locale_name($MASTER_LANGUAGE)." version</a>" @@ -46,6 +47,7 @@ if (count($msgs) == 0) echo "directory in the Wine source tree and make it include a new language file for\n"; echo get_lang_name($lang)." (see $WINE_WIKI_TRANSLATIONS for a guide to\n"; echo "translating)</li>"; + echo "</div>"; exit(); }

1 0

Paul Vriens : transl: Replace $MASTER_LANGUAGE_NAME by the real locale name .
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: tools Branch: master Commit: f9071cf793f70c8f340a214dd209ba672d917b4a URL: http://source.winehq.org/git/tools.git/?a=commit;h=f9071cf793f70c8f340a214d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 23 09:10:38 2009 +0200 transl: Replace $MASTER_LANGUAGE_NAME by the real locale name. --- transl/php/lib.php | 1 - transl/php/resfile.php | 4 ++-- transl/php/resource.php | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index bfaed8d..b293ec2 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -1,7 +1,6 @@ <?php $MASTER_LANGUAGE = "009:01"; -$MASTER_LANGUAGE_NAME = "English (US)"; $WINE_WIKI_TRANSLATIONS = "<a href=\"redirect.php?url=http://wiki.winehq.org/Translating\">http://wiki.winehq.org/Translating</a>"; diff --git a/transl/php/resfile.php b/transl/php/resfile.php index 8245e26..6145752 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -40,7 +40,7 @@ if (count($msgs) == 0) echo "<p>This module is not translated into ".get_lang_name($lang).".</p>\n"; echo "<ul><li>If you want to see what resources are in this module, check the " - .gen_resfile_a($MASTER_LANGUAGE, $resfile)."English (US) version</a>" + .gen_resfile_a($MASTER_LANGUAGE, $resfile).get_locale_name($MASTER_LANGUAGE)." version</a>" ." of this module</li>\n"; echo "<li>If you want to translate this module you should check the $resfile\n"; echo "directory in the Wine source tree and make it include a new language file for\n"; @@ -91,7 +91,7 @@ foreach ($msgs as $value) $value = preg_replace("/@RES$([^:$]+):([^:\)]+)\)/", get_resource_name($m[1], $m[2]), $value); if (is_dumpable_type($m[1]) && (strpos($value, "Missing: ") === 0)) $value .= " (see ".gen_resource_a($MASTER_LANGUAGE, $resfile, $m[1], $m[2]) - .$MASTER_LANGUAGE_NAME." resource</a>)"; + .get_locale_name($MASTER_LANGUAGE)." resource</a>)"; } } diff --git a/transl/php/resource.php b/transl/php/resource.php index 68a9e55..4f51879 100644 --- a/transl/php/resource.php +++ b/transl/php/resource.php @@ -72,7 +72,7 @@ if (!$compare) { echo "<tr class=\"subheader\"><td colspan=\"3\" style=\"text-align: right\">"; echo "<small>".gen_resource_a($lang, $resfile, $type, $id, TRUE); - echo "Compare with ".$MASTER_LANGUAGE_NAME." >></a></small>"; + echo "Compare with ".get_locale_name($MASTER_LANGUAGE)." >></a></small>"; echo "</td></tr>"; } } @@ -80,7 +80,7 @@ else { echo "<tr class=\"subheader\"><td colspan=\"5\" style=\"text-align: right\">"; echo "<small>".gen_resource_a($lang, $resfile, $type, $id, FALSE); - echo "<< Hide compare with ".$MASTER_LANGUAGE_NAME."</a></small>"; + echo "<< Hide compare with ".get_locale_name($MASTER_LANGUAGE)."</a></small>"; echo "</td></tr>"; echo "<tr class=\"subheader\"><td>id</td><td> </td><td>".get_lang_name($lang)."</td><td> </td><td>".get_lang_name($MASTER_LANGUAGE)."</td></tr>";

1 0

Paul Vriens : transl: Remove an unused variable.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: tools Branch: master Commit: ef2efe8ff8ec85309ec8294f72eae51ead114e6a URL: http://source.winehq.org/git/tools.git/?a=commit;h=ef2efe8ff8ec85309ec8294f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 23 09:03:49 2009 +0200 transl: Remove an unused variable. --- transl/php/lib.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index 4255905..bfaed8d 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -1,7 +1,6 @@ <?php $MASTER_LANGUAGE = "009:01"; -$MASTER_LANGUAGE_BINID = 1033; $MASTER_LANGUAGE_NAME = "English (US)"; $WINE_WIKI_TRANSLATIONS = "<a href=\"redirect.php?url=http://wiki.winehq.org/Translating\">http://wiki.winehq.org/Translating</a>";

1 0

Alexander Nicolaysen Sørnes : Move votes when merging versions
by Alexander Nicolaysen Sørnes July 23, 2009

July 23, 2009

Module: appdb Branch: master Commit: f95f3d533a78198a5ef058bddfd17b2a9a12efb1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f95f3d533a78198a5ef058bd… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 23 16:25:36 2009 +0200 Move votes when merging versions --- include/version.php | 3 ++ include/vote.php | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/include/version.php b/include/version.php index 94b5071..064d890 100644 --- a/include/version.php +++ b/include/version.php @@ -1860,6 +1860,9 @@ class version { $aChildren[] = $oDownload; } + /* Get votes, include deleted ones */ + $aChildren += vote::getVotesForVersion($this->iVersionId); + return $aChildren; } diff --git a/include/vote.php b/include/vote.php index c19874f..520beca 100644 --- a/include/vote.php +++ b/include/vote.php @@ -70,6 +70,62 @@ class vote return TRUE; } + + public function getVotesForVersion($iVersionId) + { + $aRet = array(); + $hResult = query_parameters("SELECT * FROM appVotes WHERE versionId = '?'", + $iVersionId); + + if(!$hResult) + return $aRet; + + while($oRow = mysql_fetch_object($hResult)) + $aRet[] = new vote(null, $oRow); + + return $aRet; + } + + public function objectGetId() + { + return $this->iVoteId; + } + + public function objectGetSubmitterId() + { + return $this->iUserId; + } + + public function objectGetParent($sClass = '') + { + return new version($this->iVersionId); + } + + public function objectSetParent($iNewId, $sClass = '') + { + $this->iVersionId = $iNewId; + } + + public function canEdit() + { + if($_SESSION['current']->iUserId == $this->iUserId) + return true; + + $oVersion = new version($this->iVersionId); + + return $oVersion->canEdit(); + } + + function objectGetMail($sAction, $bMailSubmitter, $bParentAction) + { + return array(null, null, null); /* No mail */ + } + + public static function objectGetMailOptions($sAction, $bMailSubmitter, + $bParentAction) + { + return new mailOptions(); + } } class voteManager

1 0