wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Juan Lang : wininet: Store security flags in WININET_NETCONNECTION.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 77c4ade08bbd6a76d59c2c6e45a4585470909539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c4ade08bbd6a76d59c2c6e4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 28 16:46:41 2010 -0700 wininet: Store security flags in WININET_NETCONNECTION. --- dlls/wininet/http.c | 11 +++++++++++ dlls/wininet/internet.h | 1 + 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f5ae426..5c278d3 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1887,6 +1887,17 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, http_request_t *req = (http_request_t*)hdr; switch(option) { + case INTERNET_OPTION_SECURITY_FLAGS: + { + DWORD flags; + + if (!buffer || size != sizeof(DWORD)) + return ERROR_INVALID_PARAMETER; + flags = *(DWORD *)buffer; + TRACE("%08x\n", flags); + req->netConnection.security_flags = flags; + return ERROR_SUCCESS; + } case INTERNET_OPTION_SEND_TIMEOUT: case INTERNET_OPTION_RECEIVE_TIMEOUT: TRACE("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT\n"); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 40de22f..109179f 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -53,6 +53,7 @@ typedef struct BOOL useSSL; int socketFD; void *ssl_s; + DWORD security_flags; } WININET_NETCONNECTION; static inline LPWSTR heap_strdupW(LPCWSTR str)

1 0

Juan Lang : wininet: Store WININET_NETCONNECTION * in SSL context.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: ce0164c3f784e1768b74296b7a19c92d030a8723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0164c3f784e1768b74296b7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 28 16:33:19 2010 -0700 wininet: Store WININET_NETCONNECTION * in SSL context. --- dlls/wininet/netconnection.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 6edc9ea..9717b92 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -122,6 +122,7 @@ static SSL_METHOD *meth; static SSL_CTX *ctx; static int hostname_idx; static int error_idx; +static int conn_idx; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -459,6 +460,15 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) LeaveCriticalSection(&init_ssl_cs); return ERROR_OUTOFMEMORY; } + conn_idx = pSSL_get_ex_new_index(0, (void *)"netconn index", + NULL, NULL, NULL); + if (conn_idx == -1) + { + ERR("SSL_get_ex_new_index failed; %s\n", + pERR_error_string(pERR_get_error(), 0)); + LeaveCriticalSection(&init_ssl_cs); + return ERROR_OUTOFMEMORY; + } pSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, netconn_secure_verify); pCRYPTO_set_id_callback(ssl_thread_id); @@ -670,7 +680,20 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) ERR("SSL_connect failed: %d\n", res); goto fail; } - pSSL_set_ex_data(connection->ssl_s, hostname_idx, hostname); + if (!pSSL_set_ex_data(connection->ssl_s, hostname_idx, hostname)) + { + ERR("SSL_set_ex_data failed: %s\n", + pERR_error_string(pERR_get_error(), 0)); + res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + goto fail; + } + if (!pSSL_set_ex_data(connection->ssl_s, conn_idx, connection)) + { + ERR("SSL_set_ex_data failed: %s\n", + pERR_error_string(pERR_get_error(), 0)); + res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + goto fail; + } cert = pSSL_get_peer_certificate(connection->ssl_s); if (!cert) {

1 0

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

30 Sep '10

Module: wine Branch: master Commit: 3e51313e37b2062dee2b4a5ee06b8d981728ff99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e51313e37b2062dee2b4a5ee… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 28 16:14:21 2010 -0700 wininet: Don't make use of OpenSSL's security checks, as crypt32 also verifies certificate chain. --- dlls/wininet/netconnection.c | 66 +++++++++++++++++++----------------------- 1 files changed, 30 insertions(+), 36 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 54ca51b..6edc9ea 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -290,55 +290,49 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) SSL *ssl; WCHAR *server; BOOL ret = FALSE; + 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); - 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); + } + if (!endCert) ret = FALSE; + if (ret) + { + DWORD_PTR err = netconn_verify_cert(endCert, store, server); - 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); } - } else - pSSL_set_ex_data(ssl, error_idx, (void *)ERROR_INTERNET_SEC_CERT_ERRORS); - + CertFreeCertificateContext(endCert); + CertCloseStore(store, 0); + } return ret; }

1 0

Alexandre Julliard : winmm: Make MCI_STATUS return type a 64-bit integer on 64-bit platforms.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 9387810dabbb7f430d8d77ab11da5c0456f5a3b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9387810dabbb7f430d8d77ab1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 29 20:16:58 2010 +0200 winmm: Make MCI_STATUS return type a 64-bit integer on 64-bit platforms. Based on a patch by Octavian Voicu. --- dlls/mciavi32/mciavi_res.rc | 8 +++++++- dlls/mciqtz32/mciavi_res.rc | 8 +++++++- dlls/winmm/winmm_res.rc | 20 +++++++++++++------- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/mciavi32/mciavi_res.rc b/dlls/mciavi32/mciavi_res.rc index 6482e9e..beffdd5 100644 --- a/dlls/mciavi32/mciavi_res.rc +++ b/dlls/mciavi32/mciavi_res.rc @@ -22,6 +22,12 @@ #include "mmddk.h" #include "digitalv.h" +#ifdef MCI_INTEGER64 +#define MCI_DWORD_PTR MCI_INTEGER64 +#else +#define MCI_DWORD_PTR MCI_INTEGER +#endif + MCIAVI RCDATA BEGIN L"play\0", MCI_PLAY, 0, MCI_COMMAND_HEAD, @@ -415,7 +421,7 @@ L"cancel\0", 0x00080000L, MCI_FLAG, L"return position\0", 0x00100000L, MCI_FLAG, L"\0", 0x00000000L, MCI_END_COMMAND, L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, -L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"test\0", 0x00000020L, MCI_FLAG, diff --git a/dlls/mciqtz32/mciavi_res.rc b/dlls/mciqtz32/mciavi_res.rc index 6482e9e..beffdd5 100644 --- a/dlls/mciqtz32/mciavi_res.rc +++ b/dlls/mciqtz32/mciavi_res.rc @@ -22,6 +22,12 @@ #include "mmddk.h" #include "digitalv.h" +#ifdef MCI_INTEGER64 +#define MCI_DWORD_PTR MCI_INTEGER64 +#else +#define MCI_DWORD_PTR MCI_INTEGER +#endif + MCIAVI RCDATA BEGIN L"play\0", MCI_PLAY, 0, MCI_COMMAND_HEAD, @@ -415,7 +421,7 @@ L"cancel\0", 0x00080000L, MCI_FLAG, L"return position\0", 0x00100000L, MCI_FLAG, L"\0", 0x00000000L, MCI_END_COMMAND, L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, -L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"test\0", 0x00000020L, MCI_FLAG, diff --git a/dlls/winmm/winmm_res.rc b/dlls/winmm/winmm_res.rc index c73ec6e..949d55c 100644 --- a/dlls/winmm/winmm_res.rc +++ b/dlls/winmm/winmm_res.rc @@ -25,6 +25,12 @@ #include "windef.h" #include "mmddk.h" +#ifdef MCI_INTEGER64 +#define MCI_DWORD_PTR MCI_INTEGER64 +#else +#define MCI_DWORD_PTR MCI_INTEGER +#endif + LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL CORE RCDATA @@ -72,7 +78,7 @@ L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"\0", 0x00000000L, MCI_END_COMMAND, L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, -L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"\0", 0x00000100L, MCI_CONSTANT, @@ -218,7 +224,7 @@ L"on\0", 0x00002000L, MCI_FLAG, L"off\0", 0x00004000L, MCI_FLAG, L"\0", 0x00000000L, MCI_END_COMMAND, L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, -L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"\0", 0x00000100L, MCI_CONSTANT, @@ -289,7 +295,7 @@ L"shareable\0", 0x00000100L, MCI_FLAG, L"buffer\0", 0x00010000L, MCI_INTEGER, L"\0", 0x00000000L, MCI_END_COMMAND, L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, -L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"\0", 0x00000100L, MCI_CONSTANT, @@ -391,7 +397,7 @@ END CDAUDIO RCDATA BEGIN L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, -L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"\0", 0x00000100L, MCI_CONSTANT, @@ -442,7 +448,7 @@ END SEQUENCER RCDATA BEGIN L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, -L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"\0", 0x00000100L, MCI_CONSTANT, @@ -571,7 +577,7 @@ L"door open\0", 0x00000100L, MCI_FLAG, L"door closed\0", 0x00000200L, MCI_FLAG, L"\0", 0x00000000L, MCI_END_COMMAND, L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, -L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"\0", 0x00000100L, MCI_CONSTANT, @@ -691,7 +697,7 @@ L"\0", 0x00000000L, MCI_END_CONSTANT, L"parent\0", 0x00020000L, MCI_INTEGER, L"\0", 0x00000000L, MCI_END_COMMAND, L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, -L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"\0", 0x00000100L, MCI_CONSTANT,

1 0

Alexandre Julliard : makefiles: Use the -m16 option with 16-bit resources for consistency.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 88be48ebebb692ac5b7eaa5e8643e5277960111f URL: http://source.winehq.org/git/wine.git/?a=commit;h=88be48ebebb692ac5b7eaa5e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 29 20:15:57 2010 +0200 makefiles: Use the -m16 option with 16-bit resources for consistency. --- dlls/display.drv16/Makefile.in | 2 +- dlls/gdi.exe16/Makefile.in | 2 +- dlls/krnl386.exe16/Makefile.in | 2 +- dlls/mouse.drv16/Makefile.in | 2 +- dlls/ole2nls.dll16/Makefile.in | 2 +- dlls/shell.dll16/Makefile.in | 2 +- dlls/user.exe16/Makefile.in | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/display.drv16/Makefile.in b/dlls/display.drv16/Makefile.in index 60e9392..1c2f34c 100644 --- a/dlls/display.drv16/Makefile.in +++ b/dlls/display.drv16/Makefile.in @@ -2,7 +2,7 @@ MODULE = display.drv16 IMPORTS = user32 EXTRADLLFLAGS = -m16 -EXTRARCFLAGS = -O res16 +EXTRARCFLAGS = -m16 C_SRCS = display.c diff --git a/dlls/gdi.exe16/Makefile.in b/dlls/gdi.exe16/Makefile.in index 66afc86..8f87e28 100644 --- a/dlls/gdi.exe16/Makefile.in +++ b/dlls/gdi.exe16/Makefile.in @@ -2,7 +2,7 @@ MODULE = gdi.exe16 IMPORTS = user32 advapi32 gdi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,gdi32.dll,--heap,65520 -EXTRARCFLAGS = -O res16 +EXTRARCFLAGS = -m16 C_SRCS = \ bidi.c \ diff --git a/dlls/krnl386.exe16/Makefile.in b/dlls/krnl386.exe16/Makefile.in index 537dbdc..6c7e5ea 100644 --- a/dlls/krnl386.exe16/Makefile.in +++ b/dlls/krnl386.exe16/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = winecrt0 kernel32 ntdll DELAYIMPORTS = ddraw dsound user32 EXTRAIMPLIBFLAGS = -m16 EXTRADLLFLAGS = -m16 -nodefaultlibs -Wb,--dll-name,kernel -EXTRARCFLAGS = -O res16 +EXTRARCFLAGS = -m16 C_SRCS = \ atom.c \ diff --git a/dlls/mouse.drv16/Makefile.in b/dlls/mouse.drv16/Makefile.in index 0749fbd..c74e423 100644 --- a/dlls/mouse.drv16/Makefile.in +++ b/dlls/mouse.drv16/Makefile.in @@ -2,7 +2,7 @@ MODULE = mouse.drv16 IMPORTS = user32 EXTRADLLFLAGS = -m16 -EXTRARCFLAGS = -O res16 +EXTRARCFLAGS = -m16 C_SRCS = mouse.c diff --git a/dlls/ole2nls.dll16/Makefile.in b/dlls/ole2nls.dll16/Makefile.in index a8fdd84..f7cf735 100644 --- a/dlls/ole2nls.dll16/Makefile.in +++ b/dlls/ole2nls.dll16/Makefile.in @@ -1,7 +1,7 @@ MODULE = ole2nls.dll16 EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll -EXTRARCFLAGS = -O res16 +EXTRARCFLAGS = -m16 C_SRCS = ole2nls.c diff --git a/dlls/shell.dll16/Makefile.in b/dlls/shell.dll16/Makefile.in index 17bbf0c..5512b54 100644 --- a/dlls/shell.dll16/Makefile.in +++ b/dlls/shell.dll16/Makefile.in @@ -2,7 +2,7 @@ MODULE = shell.dll16 IMPORTS = shell32 user32 gdi32 advapi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,shell32.dll -EXTRARCFLAGS = -O res16 +EXTRARCFLAGS = -m16 C_SRCS = shell.c diff --git a/dlls/user.exe16/Makefile.in b/dlls/user.exe16/Makefile.in index 7860f43..b50b3c9 100644 --- a/dlls/user.exe16/Makefile.in +++ b/dlls/user.exe16/Makefile.in @@ -1,7 +1,7 @@ MODULE = user.exe16 IMPORTS = mpr user32 gdi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520 -EXTRARCFLAGS = -O res16 +EXTRARCFLAGS = -m16 C_SRCS = \ bidi.c \

1 0

Alexandre Julliard : makefiles: Pass target options to wrc.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: c685b99d9bbf8ba4f58a8f7c22770f019484d9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c685b99d9bbf8ba4f58a8f7c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 29 20:13:44 2010 +0200 makefiles: Pass target options to wrc. --- Make.rules.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 5415e8c..c5518c1 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -17,7 +17,7 @@ INCLUDES = -I$(srcdir) -I. -I$(top_srcdir)/include -I$(top_builddir)/include ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS) IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS) -RCFLAGS = --nostdinc $(INCLUDES) $(DEFS) $(EXTRARCFLAGS) +RCFLAGS = --nostdinc $(TARGETFLAGS) $(INCLUDES) $(DEFS) $(EXTRARCFLAGS) IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) @@ -62,7 +62,7 @@ filter: dummy $(LDPATH) $(WMC) -i -U -H /dev/null -o $@ $< .rc.res: - $(LDPATH) $(WRC) $(RCFLAGS) -fo$@ $< + $(LDPATH) $(WRC) $(RCFLAGS) -o $@ $< .idl.h: $(WIDL) $(IDLFLAGS) -h -H $@ $<

1 0

Alexandre Julliard : wrc: Add support for target options, and define _WIN64 for 64-bit builds.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: e6340f1652e0328bbfeeae58462f41400b09b38a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6340f1652e0328bbfeeae584… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 29 20:13:28 2010 +0200 wrc: Add support for target options, and define _WIN64 for 64-bit builds. --- tools/wrc/wrc.c | 102 ++++++++++++++++++++++++++++---------------------- tools/wrc/wrc.man.in | 27 ++++++++----- 2 files changed, 74 insertions(+), 55 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 614cc84..99285db 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -52,41 +52,32 @@ static const char usage[] = "Usage: wrc [options...] [infile[.rc|.res]]\n" - " -D id[=val] Define preprocessor identifier id=val\n" - " -E Preprocess only\n" - " -F target Ignored for compatibility with windres\n" - " -h Prints this summary\n" - " -i file The name of the input file\n" - " -I path Set include search dir to path (multiple -I allowed)\n" - " -J format The input format (either `rc' or `rc16')\n" - " -l lan Set default language to lan (default is neutral {0, 0})\n" - " -o file Output to file (default is infile.res)\n" - " -O format The output format (either `res' or `res16`)\n" - " -r Ignored for compatibility with rc\n" - " -U id Undefine preprocessor identifier id\n" - " -v Enable verbose mode\n" - "The following long options are supported:\n" - " --debug=nn Set debug level to 'nn'\n" - " --define Synonym for -D\n" - " --endianess=e Set output byte-order e={n[ative], l[ittle], b[ig]}\n" - " (win32 only; default is " ENDIAN "-endian)\n" - " --help Synonym for -h\n" - " --include-dir Synonym for -I\n" - " --input Synonym for -i\n" - " --input-format Synonym for -J\n" - " --language Synonym for -l\n" - " --no-use-temp-file Ignored for compatibility with windres\n" - " --nostdinc Disables searching the standard include path\n" - " --output -fo Synonym for -o\n" - " --output-format Synonym for -O\n" - " --pedantic Enable pedantic warnings\n" - " --preprocessor Specifies the preprocessor to use, including arguments\n" - " --target Synonym for -F\n" - " --undefine Synonym for -U\n" - " --use-temp-file Ignored for compatibility with windres\n" - " --verbose Synonym for -v\n" - " --verify-translations Check the status of the various translations\n" - " --version Print version and exit\n" + " -b, --target=TARGET Specify target CPU and platform when cross-compiling\n" + " -D, --define id[=val] Define preprocessor identifier id=val\n" + " --debug=nn Set debug level to 'nn'\n" + " -E Preprocess only\n" + " --endianess=e Set output byte-order e={n[ative], l[ittle], b[ig]}\n" + " (win32 only; default is " ENDIAN "-endian)\n" + " -F TARGET Synonym for -b for compatibility with windres\n" + " -fo FILE Synonym for -o for compatibility with windres\n" + " -h, --help Prints this summary\n" + " -i, --input=FILE The name of the input file\n" + " -I, --include-dir=PATH Set include search dir to path (multiple -I allowed)\n" + " -J, --input-format=FORMAT The input format (either `rc' or `rc16')\n" + " -l, --language=LANG Set default language to LANG (default is neutral {0, 0})\n" + " -m16, -m32, -m64 Build for 16-bit, 32-bit resp. 64-bit platforms\n" + " --no-use-temp-file Ignored for compatibility with windres\n" + " --nostdinc Disables searching the standard include path\n" + " -o, --output=FILE Output to file (default is infile.res)\n" + " -O, --output-format=FORMAT The output format (either `res' or `res16`)\n" + " --pedantic Enable pedantic warnings\n" + " --preprocessor Specifies the preprocessor to use, including arguments\n" + " -r Ignored for compatibility with rc\n" + " -U, --undefine id Undefine preprocessor identifier id\n" + " --use-temp-file Ignored for compatibility with windres\n" + " -v, --verbose Enable verbose mode\n" + " --verify-translations Check the status of the various translations\n" + " --version Print version and exit\n" "Input is taken from stdin if no sourcefile specified.\n" "Debug level 'n' is a bitmask with following meaning:\n" " * 0x01 Tell which resource is parsed (verbose mode)\n" @@ -153,6 +144,8 @@ int no_preprocess = 0; int check_utf8 = 1; /* whether to check for valid utf8 */ +static int pointer_size = sizeof(void *); + static int verify_translations_mode; char *output_name = NULL; /* The name given by the -o option */ @@ -187,7 +180,7 @@ enum long_options_values }; static const char short_options[] = - "D:Ef:F:hi:I:J:l:o:O:rU:v"; + "b:D:Ef:F:hi:I:J:l:m:o:O:rU:v"; static const struct option long_options[] = { { "debug", 1, NULL, LONG_OPT_DEBUG }, { "define", 1, NULL, 'D' }, @@ -320,6 +313,19 @@ static int load_file( const char *input_name, const char *output_name ) return ret; } +static void set_target( const char *target ) +{ + char *p, *cpu = xstrdup( target ); + + /* target specification is in the form CPU-MANUFACTURER-OS or CPU-MANUFACTURER-KERNEL-OS */ + if (!(p = strchr( cpu, '-' ))) error( "Invalid target specification '%s'\n", target ); + *p = 0; + if (!strcmp( cpu, "amd64" ) || !strcmp( cpu, "x86_64" ) || !strcmp( cpu, "ia64" )) + pointer_size = 8; + else + pointer_size = 4; + free( cpu ); +} int main(int argc,char *argv[]) { @@ -346,8 +352,6 @@ int main(int argc,char *argv[]) /* Set the default defined stuff */ set_version_defines(); wpp_add_cmdline_define("RC_INVOKED=1"); - wpp_add_cmdline_define("__WIN32__=1"); - wpp_add_cmdline_define("__FLAT__=1"); /* Microsoft RC always searches current directory */ wpp_add_include_path("."); @@ -422,8 +426,9 @@ int main(int argc,char *argv[]) case 'E': preprocess_only = 1; break; + case 'b': case 'F': - /* ignored for compatibility with windres */ + set_target( optarg ); break; case 'h': printf(usage); @@ -447,6 +452,12 @@ int main(int argc,char *argv[]) defaultlanguage = new_language(PRIMARYLANGID(lan), SUBLANGID(lan)); } break; + case 'm': + if (!strcmp( optarg, "16" )) win32 = 0; + else if (!strcmp( optarg, "32" )) { win32 = 1; pointer_size = 4; } + else if (!strcmp( optarg, "64" )) { win32 = 1; pointer_size = 8; } + else error( "Invalid option: -m%s\n", optarg ); + break; case 'f': if (*optarg != 'o') error("Unknown option: -f%s\n", optarg); optarg++; @@ -456,12 +467,7 @@ int main(int argc,char *argv[]) else error("Too many output files.\n"); break; case 'O': - if (strcmp(optarg, "res16") == 0) - { - win32 = 0; - wpp_del_define("__WIN32__"); - wpp_del_define("__FLAT__"); - } + if (strcmp(optarg, "res16") == 0) win32 = 0; else if (strcmp(optarg, "res")) warning("Output format %s not supported.\n", optarg); break; case 'r': @@ -485,6 +491,12 @@ int main(int argc,char *argv[]) return 1; } + if (win32) + { + wpp_add_cmdline_define("_WIN32=1"); + if (pointer_size == 8) wpp_add_cmdline_define("_WIN64=1"); + } + /* If we do need to search standard includes, add them to the path */ if (stdinc) { diff --git a/tools/wrc/wrc.man.in b/tools/wrc/wrc.man.in index 5c8d0c0..c5d6a60 100644 --- a/tools/wrc/wrc.man.in +++ b/tools/wrc/wrc.man.in @@ -21,6 +21,17 @@ specified with \fI-o\fR, then \fBwrc\fR will write the output to no inputfile was given. .SH OPTIONS .TP +.BI \-b,\ --target= cpu-manufacturer[-kernel]-os +Specify the target CPU and platform on which the generated code will +be built. The target specification is in the standard autoconf format +as returned by config.sub. +.TP +.I \fB\-D\fR, \fB\-\-define\fR=\fIid[=val]\fR +Define preprocessor identifier \fIid\fR to (optionally) value \fIval\fR. +See also +.B PREPROCESSOR +below. +.TP .I \fB\-\-debug\fR=\fInn\fR Set debug level to \fInn\fR. The value is a bitmask consisting of 1=verbose, 2=dump internals, 4=resource parser trace, 8=preprocessor @@ -32,20 +43,11 @@ l[ittle] or b[ig]. Only resources in source-form can be reorderd. Native ordering depends on the system on which \fBwrc\fR was built. You can see the native ordering by typing \fIwrc \-h\fR. .TP -.I \fB\-D\fR, \fB\-\-define\fR=\fIid[=val]\fR -Define preprocessor identifier \fIid\fR to (optionally) value \fIval\fR. -See also -.B PREPROCESSOR -below. -.TP .I \fB\-E\fR Preprocess only. The output is written to standard output if no outputfile was selected. The output is compatible with what gcc would generate. .TP -.I \fB\-F\fR, \fB\-\-target\fR -Ignored for compatibility with \fIwindres\fR. -.TP .I \fB\-h\fR, \fB\-\-help\fR Prints a summary message and exits. .TP @@ -73,6 +75,11 @@ input to 'rc16' disables the recognition of win32 keywords. Set default language to \fIlan\fR. Default is the neutral language 0 (i.e. "LANGUAGE 0, 0"). .TP +.B \-m16, -m32, -m64 +Generate resources for 16-bit, 32-bit, respectively 64-bit +platforms. The only difference between 32-bit and 64-bit is whether +the _WIN64 preprocessor symbol is defined. +.TP .I \fB\-\-nostdinc\fR Do not search the standard include path, look for include files only in the directories explicitly specified with the \fI\-I\fR option. @@ -136,7 +143,7 @@ __WRC_MINOR__ Minor version of wrc .br __WRC_PATCHLEVEL__ Patch level .PP -Win32 compilation mode also sets __WIN32__ to 1 and __FLAT__ to 1. +Win32 compilation mode also sets _WIN32 to 1. .PP Special macros __FILE__, __LINE__, __TIME__ and __DATE__ are also recognized and expand to their respective equivalent.

1 0

Jeremy Newman : update the RSVP page for 2010
by Jeremy Newman 29 Sep '10

29 Sep '10

Module: website Branch: master Commit: 7c4a2f22891b2880afd66b01731babc87ed2852b URL: http://source.winehq.org/git/website.git/?a=commit;h=7c4a2f22891b2880afd66b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Sep 29 16:26:06 2010 -0500 update the RSVP page for 2010 --- templates/en/wineconf/rsvp.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/wineconf/rsvp.template b/templates/en/wineconf/rsvp.template index 5d2fa83..df4999d 100644 --- a/templates/en/wineconf/rsvp.template +++ b/templates/en/wineconf/rsvp.template @@ -3,7 +3,7 @@ <table width="100%"> <tr> <td><img src="{$root}/images/wineconf/wineconf_logo.jpg" width="295" height="108" alt="-LOGO-"></td> - <td align="right"><center>September 16 - 17, 2006 Reading, UK</center></td> + <td align="right"><center>November 20 - 21, 2010 Paris, France</center></td> </tr> </table>

1 0

André Hentschel : German link to Launchpad PPA
by Jeremy Newman 29 Sep '10

29 Sep '10

Module: website Branch: master Commit: 6f2fbd8a848e3414a818301a491e08dba8eb956a URL: http://source.winehq.org/git/website.git/?a=commit;h=6f2fbd8a848e3414a81830… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 29 18:45:36 2010 +0200 German link to Launchpad PPA --- templates/de/download/deb.template | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/templates/de/download/deb.template b/templates/de/download/deb.template index 13ff76c..19cb94f 100644 --- a/templates/de/download/deb.template +++ b/templates/de/download/deb.template @@ -57,3 +57,5 @@ Derivate. Zuerst öffne ein Terminalfenster (Anwendungen->Zubehör->Term Aktualisiere dann die APT-Paketinformationen durch Ausführen von 'sudo apt-get update'. Du kannst nun Wine durch Ausführen von 'sudo apt-get install wine1.3' im Terminal installieren. + +Wenn du das PPA durchsuchen willst, kannst du es <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">bei Launchpad anschauen</a>.

1 0

Jacek Caban : mshtml: Added nsIURI::GetPath implementation.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: c6e1a0c81e8ffd9f0ee7d7fabae24b470ce55285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e1a0c81e8ffd9f0ee7d7fab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 12:45:59 2010 +0200 mshtml: Added nsIURI::GetPath implementation. --- dlls/mshtml/nsio.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 137b6fb..d67c7b7 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1928,8 +1928,7 @@ static nsresult NSAPI nsURI_GetPath(nsIURL *iface, nsACString *aPath) if(This->nsuri) return nsIURI_GetPath(This->nsuri, aPath); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + return get_uri_string(This, Uri_PROPERTY_PATH, aPath); } static nsresult NSAPI nsURI_SetPath(nsIURL *iface, const nsACString *aPath)

1 0

← Newer
1
2
3
4
5
6
7
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2010