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

Leonid Lobachev : wined3d: Add missing calling convention specifiers.
by Alexandre Julliard 23 Jul '09

23 Jul '09

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 23 Jul '09

23 Jul '09

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 23 Jul '09

23 Jul '09

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 23 Jul '09

23 Jul '09

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 23 Jul '09

23 Jul '09

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 23 Jul '09

23 Jul '09

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 23 Jul '09

23 Jul '09

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 23 Jul '09

23 Jul '09

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 23 Jul '09

23 Jul '09

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 23 Jul '09

23 Jul '09

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