October 2010 - Wine-commits

Juan Lang : winhttp: Support querying the cipher strength of an SSL connection.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 4127062a3eaf9938aafc7b3c4909d3298e11a156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4127062a3eaf9938aafc7b3c4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 29 09:54:34 2010 -0700 winhttp: Support querying the cipher strength of an SSL connection. --- dlls/winhttp/net.c | 19 +++++++++++++++++++ dlls/winhttp/session.c | 4 ++-- dlls/winhttp/winhttp_private.h | 1 + 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 4812979..7db7a66 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -124,6 +124,8 @@ MAKE_FUNCPTR( SSL_get_ex_data_X509_STORE_CTX_idx ); MAKE_FUNCPTR( SSL_get_peer_certificate ); MAKE_FUNCPTR( SSL_CTX_set_default_verify_paths ); MAKE_FUNCPTR( SSL_CTX_set_verify ); +MAKE_FUNCPTR( SSL_get_current_cipher ); +MAKE_FUNCPTR( SSL_CIPHER_get_bits ); MAKE_FUNCPTR( CRYPTO_num_locks ); MAKE_FUNCPTR( CRYPTO_set_id_callback ); @@ -464,6 +466,8 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_get_peer_certificate ); LOAD_FUNCPTR( SSL_CTX_set_default_verify_paths ); LOAD_FUNCPTR( SSL_CTX_set_verify ); + LOAD_FUNCPTR( SSL_get_current_cipher ); + LOAD_FUNCPTR( SSL_CIPHER_get_bits ); #undef LOAD_FUNCPTR #define LOAD_FUNCPTR(x) \ @@ -1067,3 +1071,18 @@ const void *netconn_get_certificate( netconn_t *conn ) return NULL; #endif } + +int netconn_get_cipher_strength( netconn_t *conn ) +{ +#ifdef SONAME_LIBSSL + SSL_CIPHER *cipher; + int bits = 0; + + if (!conn->secure) return 0; + if (!(cipher = pSSL_get_current_cipher( conn->ssl_conn ))) return 0; + pSSL_CIPHER_get_bits( cipher, &bits ); + return bits; +#else + return 0; +#endif +} diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 7f6350f..ef4ef08 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -641,7 +641,7 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf else ci->lpszSignatureAlgName = NULL; ci->lpszEncryptionAlgName = NULL; - ci->dwKeySize = 128; + ci->dwKeySize = netconn_get_cipher_strength( &request->netconn ); CertFreeCertificateContext( cert ); *buflen = sizeof(*ci); @@ -656,7 +656,7 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf return FALSE; } - *(DWORD *)buffer = 128; /* FIXME */ + *(DWORD *)buffer = netconn_get_cipher_strength( &request->netconn ); *buflen = sizeof(DWORD); return TRUE; } diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index c2dfdbe..5da3ae1 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -229,6 +229,7 @@ BOOL netconn_secure_connect( netconn_t *, WCHAR * ); BOOL netconn_send( netconn_t *, const void *, size_t, int, int * ); DWORD netconn_set_timeout( netconn_t *, BOOL, int ); const void *netconn_get_certificate( netconn_t * ); +int netconn_get_cipher_strength( netconn_t * ); BOOL set_cookies( request_t *, const WCHAR * ); BOOL add_cookie_headers( request_t * );

1 0

Alexandre Julliard : tests: Make some variables static.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 730f01801fbaae9cacbbc13be3c4dab3de7b1c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=730f01801fbaae9cacbbc13be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:41:42 2010 +0200 tests: Make some variables static. --- dlls/advpack/tests/files.c | 4 ++-- dlls/amstream/tests/amstream.c | 6 +++--- dlls/comdlg32/tests/filedlg.c | 2 +- dlls/cryptnet/tests/cryptnet.c | 2 +- dlls/d3d8/tests/device.c | 2 +- dlls/d3drm/tests/d3drm.c | 6 +++--- dlls/ddraw/tests/visual.c | 24 ++++++++++++------------ dlls/dmime/tests/performance.c | 2 +- dlls/explorerframe/tests/nstc.c | 2 +- dlls/gdi32/tests/font.c | 20 ++++++++++---------- dlls/mscms/tests/profile.c | 4 ++-- dlls/msvcr90/tests/msvcr90.c | 2 +- dlls/msvcrt/tests/string.c | 2 +- dlls/msxml3/tests/domdoc.c | 4 ++-- dlls/oledb32/tests/convert.c | 2 +- dlls/opengl32/tests/opengl.c | 2 +- dlls/quartz/tests/filtergraph.c | 2 +- dlls/rpcrt4/tests/rpc_async.c | 4 ++-- dlls/shell32/tests/shlfolder.c | 2 +- dlls/ws2_32/tests/sock.c | 2 +- dlls/xmllite/tests/reader.c | 4 ++-- 21 files changed, 50 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=730f01801fbaae9cacbbc…

1 0

Alexandre Julliard : Make some variable declarations extern.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 7afdf5d9204fdccb74f547ca8588b76100e1738a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7afdf5d9204fdccb74f547ca8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:42:22 2010 +0200 Make some variable declarations extern. --- dlls/msxml3/msxml_private.h | 2 +- dlls/rpcrt4/cpsf.h | 4 ++-- dlls/wined3d/wined3d_private.h | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index a1b3b9d..6d97e96 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -223,7 +223,7 @@ static inline HRESULT return_null_ptr(void **p) #endif -void* libxslt_handle; +extern void* libxslt_handle; #ifdef SONAME_LIBXSLT # ifdef HAVE_LIBXSLT_PATTERN_H # include <libxslt/pattern.h> diff --git a/dlls/rpcrt4/cpsf.h b/dlls/rpcrt4/cpsf.h index 9cc046f..e8f1a2d 100644 --- a/dlls/rpcrt4/cpsf.h +++ b/dlls/rpcrt4/cpsf.h @@ -35,8 +35,8 @@ HRESULT CStdStubBuffer_Delegating_Construct(REFIID riid, LPUNKNOWN pUnkServer, P const MIDL_SERVER_INFO *CStdStubBuffer_GetServerInfo(IRpcStubBuffer *iface); -const IRpcStubBufferVtbl CStdStubBuffer_Vtbl; -const IRpcStubBufferVtbl CStdStubBuffer_Delegating_Vtbl; +extern const IRpcStubBufferVtbl CStdStubBuffer_Vtbl; +extern const IRpcStubBufferVtbl CStdStubBuffer_Delegating_Vtbl; BOOL fill_delegated_proxy_table(IUnknownVtbl *vtbl, DWORD num); HRESULT create_proxy(REFIID iid, IUnknown *pUnkOuter, IRpcProxyBuffer **pproxy, void **ppv); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1ab89c5..33bb437 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -157,11 +157,11 @@ struct min_lookup GLenum mip[WINED3DTEXF_LINEAR + 1]; }; -const struct min_lookup minMipLookup[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; -const struct min_lookup minMipLookup_noFilter[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; -const struct min_lookup minMipLookup_noMip[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; -const GLenum magLookup[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; -const GLenum magLookup_noFilter[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; +extern const struct min_lookup minMipLookup[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; +extern const struct min_lookup minMipLookup_noFilter[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; +extern const struct min_lookup minMipLookup_noMip[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; +extern const GLenum magLookup[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; +extern const GLenum magLookup_noFilter[WINED3DTEXF_LINEAR + 1] DECLSPEC_HIDDEN; static inline GLenum wined3d_gl_mag_filter(const GLenum mag_lookup[], WINED3DTEXTUREFILTERTYPE mag_filter) { @@ -2576,7 +2576,7 @@ struct IWineD3DSwapChainImpl HWND device_window; }; -const IWineD3DSwapChainVtbl IWineGDISwapChain_Vtbl DECLSPEC_HIDDEN; +extern const IWineD3DSwapChainVtbl IWineGDISwapChain_Vtbl DECLSPEC_HIDDEN; void x11_copy_to_screen(IWineD3DSwapChainImpl *This, const RECT *rc) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSwapChainImpl_QueryInterface(IWineD3DSwapChain *iface,

1 0

Juan Lang : winhttp: Remove unused function pointer.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 10ef345307d43e17e7fad5b6ca4ad427567ab251 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ef345307d43e17e7fad5b6c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 29 08:14:43 2010 -0700 winhttp: Remove unused function pointer. --- dlls/winhttp/net.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 573f108..92996a7 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -121,7 +121,6 @@ MAKE_FUNCPTR( SSL_get_ex_new_index ); MAKE_FUNCPTR( SSL_get_ex_data ); MAKE_FUNCPTR( SSL_set_ex_data ); MAKE_FUNCPTR( SSL_get_ex_data_X509_STORE_CTX_idx ); -MAKE_FUNCPTR( SSL_get_verify_result ); MAKE_FUNCPTR( SSL_get_peer_certificate ); MAKE_FUNCPTR( SSL_CTX_set_default_verify_paths ); MAKE_FUNCPTR( SSL_CTX_set_verify ); @@ -451,7 +450,6 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_get_ex_data ); LOAD_FUNCPTR( SSL_set_ex_data ); LOAD_FUNCPTR( SSL_get_ex_data_X509_STORE_CTX_idx ); - LOAD_FUNCPTR( SSL_get_verify_result ); LOAD_FUNCPTR( SSL_get_peer_certificate ); LOAD_FUNCPTR( SSL_CTX_set_default_verify_paths ); LOAD_FUNCPTR( SSL_CTX_set_verify );

1 0

Juan Lang : winhttp: Don't make use of OpenSSL's security checks, as crypt32 also verifies certificate chain.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 5566d424f1e3e7298adcb2ea4941964e27b04627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5566d424f1e3e7298adcb2ea4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 29 08:18:39 2010 -0700 winhttp: Don't make use of OpenSSL's security checks, as crypt32 also verifies certificate chain. --- dlls/winhttp/net.c | 64 ++++++++++++++++++++++++--------------------------- 1 files changed, 30 insertions(+), 34 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 92996a7..a85eecd 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -343,53 +343,49 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) WCHAR *server; BOOL ret = FALSE; netconn_t *conn; + HCERTSTORE store = CertOpenStore( CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL ); ssl = pX509_STORE_CTX_get_ex_data( ctx, pSSL_get_ex_data_X509_STORE_CTX_idx() ); server = pSSL_get_ex_data( ssl, hostname_idx ); conn = pSSL_get_ex_data( ssl, conn_idx ); - if (preverify_ok) + if (store) { - HCERTSTORE store = CertOpenStore( CERT_STORE_PROV_MEMORY, 0, 0, - CERT_STORE_CREATE_NEW_FLAG, NULL ); + X509 *cert; + int i; + PCCERT_CONTEXT endCert = NULL; - if (store) + ret = TRUE; + for (i = 0; ret && i < psk_num((struct stack_st *)ctx->chain); i++) { - X509 *cert; - int i; - PCCERT_CONTEXT endCert = NULL; + PCCERT_CONTEXT context; - ret = TRUE; - for (i = 0; ret && i < psk_num((struct stack_st *)ctx->chain); i++) + cert = (X509 *)psk_value((struct stack_st *)ctx->chain, i); + if ((context = X509_to_cert_context( cert ))) { - PCCERT_CONTEXT context; - - cert = (X509 *)psk_value((struct stack_st *)ctx->chain, i); - if ((context = X509_to_cert_context( cert ))) - { - if (i == 0) - ret = CertAddCertificateContextToStore( store, context, - CERT_STORE_ADD_ALWAYS, &endCert ); - else - ret = CertAddCertificateContextToStore( store, context, - CERT_STORE_ADD_ALWAYS, NULL ); - CertFreeCertificateContext( context ); - } + if (i == 0) + ret = CertAddCertificateContextToStore( store, context, + CERT_STORE_ADD_ALWAYS, &endCert ); + else + ret = CertAddCertificateContextToStore( store, context, + CERT_STORE_ADD_ALWAYS, NULL ); + CertFreeCertificateContext( context ); } - if (!endCert) ret = FALSE; - if (ret) - { - DWORD_PTR err = netconn_verify_cert( endCert, store, server, - conn->security_flags ); + } + if (!endCert) ret = FALSE; + if (ret) + { + DWORD_PTR err = netconn_verify_cert( endCert, store, server, + conn->security_flags ); - if (err) - { - pSSL_set_ex_data( ssl, error_idx, (void *)err ); - ret = FALSE; - } + if (err) + { + pSSL_set_ex_data( ssl, error_idx, (void *)err ); + ret = FALSE; } - CertFreeCertificateContext( endCert ); - CertCloseStore( store, 0 ); } + CertFreeCertificateContext( endCert ); + CertCloseStore( store, 0 ); } return ret; }

1 0

Alexandre Julliard : winecfg: Make some variables static.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 0119d770a3e55f137d13e94329eb0af1d8232f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0119d770a3e55f137d13e9432… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:38:31 2010 +0200 winecfg: Make some variables static. --- programs/winecfg/theme.c | 4 ++-- programs/winecfg/winecfg.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 56b3585..4ab3689 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -423,8 +423,8 @@ static void do_apply_theme (int themeIndex, int colorIndex, int sizeIndex) } } -int updating_ui; -BOOL theme_dirty; +static int updating_ui; +static BOOL theme_dirty; static void enable_size_and_color_controls (HWND dialog, BOOL enable) { diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index 4d4a92f..1959409 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -116,7 +116,7 @@ void apply_drive_changes(void); BOOL browse_for_unix_folder(HWND dialog, WCHAR *pszPath); extern struct drive drives[26]; /* one for each drive letter */ -BOOL gui_mode; +extern BOOL gui_mode; /* Some basic utilities to make win32 suck less */ #define disable(id) EnableWindow(GetDlgItem(dialog, id), 0);

1 0

Alexandre Julliard : clock: Make some variables static.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 8599a53d2460ac18f6021b7646ad547c95dc5568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8599a53d2460ac18f6021b764… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:38:36 2010 +0200 clock: Make some variables static. --- programs/clock/winclock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/clock/winclock.c b/programs/clock/winclock.c index 34d18dd..0b2def1 100644 --- a/programs/clock/winclock.c +++ b/programs/clock/winclock.c @@ -46,7 +46,7 @@ typedef struct POINT End; } HandData; -HandData HourHand, MinuteHand, SecondHand; +static HandData HourHand, MinuteHand, SecondHand; static void DrawTicks(HDC dc, const POINT* centre, int radius) {

1 0

Alexandre Julliard : taskkill: Make some variables static.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 95e095ba314576b57e34a5571c4e7f2ef3b17181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95e095ba314576b57e34a5571… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:38:41 2010 +0200 taskkill: Make some variables static. --- programs/taskkill/taskkill.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 5508bfe..8dffdcd 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -25,11 +25,10 @@ #include "taskkill.h" +static int force_termination; -int force_termination; - -WCHAR **task_list; -unsigned int task_count; +static WCHAR **task_list; +static unsigned int task_count; struct pid_close_info {

1 0

Alexandre Julliard : cabinet/tests: Make some variables static.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 9a39cb94e4fbb89b6a243ed242e648d8c30fcde7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a39cb94e4fbb89b6a243ed24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:38:58 2010 +0200 cabinet/tests: Make some variables static. --- dlls/cabinet/tests/extract.c | 4 ++-- dlls/cabinet/tests/fdi.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index 29fd1c7..aedbdd4 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -55,10 +55,10 @@ typedef struct { } SESSION; /* function pointers */ -HMODULE hCabinet; +static HMODULE hCabinet; static HRESULT (WINAPI *pExtract)(SESSION*, LPCSTR); -CHAR CURR_DIR[MAX_PATH]; +static CHAR CURR_DIR[MAX_PATH]; static void init_function_pointers(void) { diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 5d470fa..7c7317f 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -28,7 +28,7 @@ #define MEDIA_SIZE 999999999 #define FOLDER_THRESHOLD 900000 -CHAR CURR_DIR[MAX_PATH]; +static CHAR CURR_DIR[MAX_PATH]; /* FDI callbacks */

1 0

Alexandre Julliard : d3dxof/tests: Make some variables static.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 05e24f39c391fce600fd83e4b79c03d332944ea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05e24f39c391fce600fd83e4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:39:31 2010 +0200 d3dxof/tests: Make some variables static. --- dlls/d3dxof/tests/d3dxof.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 89dfe7f..a3fc070 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -36,7 +36,7 @@ static inline void debugstr_guid( char* buf, CONST GUID *id ) static HMODULE hd3dxof; static HRESULT (WINAPI *pDirectXFileCreate)(LPDIRECTXFILE*); -char template[] = +static char template[] = "xof 0302txt 0064\n" "template Header\n" "{\n" @@ -47,7 +47,7 @@ char template[] = "}\n"; /* Same version as above compressed with mszip */ -char compressed_template[] = +static char compressed_template[] = "xof 0302tzip0064\x71\x00\x00\x00\x61\x00\x5a\x00" "\x43\x4B\x2B\x49\xCD\x2D\xC8\x49\x2C\x49\x55\xF0\x48\x4D\x4C\x49" "\x2D\xE2\xAA\xE6\xB2\x31\x76\xB1\x30\x72\x74\x32\x31\xD6\x35\x33" @@ -56,7 +56,7 @@ char compressed_template[] = "\xC8\x4D\xCC\xCA\x2F\xB2\x86\xB2\x33\xF3\x40\x6C\x17\x30\x27\x2D" "\x27\x31\xBD\xD8\x9A\xAB\x96\x8B\x0B\x00"; -char object[] = +static char object[] = "xof 0302txt 0064\n" "Header Object\n" "{\n" @@ -64,24 +64,24 @@ char object[] = "}\n"; /* Same version as above compressed with mszip */ -char compressed_object[] = +static char compressed_object[] = "xof 0302tzip0064\x2c\x00\x00\x00\x1c\x00\x20\x00" "\x43\x4b\xf3\x48\x4d\x4c\x49\x2d\x52\xf0\x4f\xca\x4a\x4d\x2e\xe1" "\xaa\xe6\x32\xb4\x56\x30\xb2\x56\x30\xb6\xe6\xaa\xe5\xe2\x02\x00"; -char empty_txt_file[] = "xof 0302txt 0064"; -char empty_bin_file[] = "xof 0302bin 0064"; +static char empty_txt_file[] = "xof 0302txt 0064"; +static char empty_bin_file[] = "xof 0302bin 0064"; /* MSZip data is generated with the command "MAKECAB.EXE /D Compress=ON /D CompressionType=MSZip file packed" * Data in cab is after the filename (null terminated) and the 32-bit checksum: * size (16-bit), packed_size (16-bit) and compressed data (with leading 16-bit CK signature) * Data in x files is preceding by 2 16-bit words: size with xof header (16 bytes) and a 0 value * It does not seem possible to generate a MSZip data with no byte, so put just 1 byte here */ /* "\n" packed with MSZip => not text */ -char empty_tzip_file[] = "xof 0302tzip0064\x11\x00\x00\x00\x01\x00\x05\x00\x43\x4b\xe3\x02\x00"; +static char empty_tzip_file[] = "xof 0302tzip0064\x11\x00\x00\x00\x01\x00\x05\x00\x43\x4b\xe3\x02\x00"; /* "\n" packed with MSZip => not token (token are 16-bit and there is only 1 byte) */ -char empty_bzip_file[] = "xof 0302bzip0064\x11\x00\x00\x00\x01\x00\x05\x00\x43\x4b\xe3\x02\x00"; -char empty_cmp_file[] = "xof 0302cmp 0064"; -char empty_xxxx_file[] = "xof 0302xxxx0064"; +static char empty_bzip_file[] = "xof 0302bzip0064\x11\x00\x00\x00\x01\x00\x05\x00\x43\x4b\xe3\x02\x00"; +static char empty_cmp_file[] = "xof 0302cmp 0064"; +static char empty_xxxx_file[] = "xof 0302xxxx0064"; static void init_function_pointers(void) {

1 0