June 2010 - Wine-Commits - list.winehq.org

Hwang YunSong : gphoto2.ds: Update Korean resource.
by Alexandre Julliard June 21, 2010

June 21, 2010

Module: wine Branch: master Commit: d81fbcd67103d38c33042964dd683fd20c91fc2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d81fbcd67103d38c33042964d… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jun 21 10:30:16 2010 +0900 gphoto2.ds: Update Korean resource. --- dlls/gphoto2.ds/gphoto2_Ko.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Ko.rc b/dlls/gphoto2.ds/gphoto2_Ko.rc index 7f83d25..922d821 100644 --- a/dlls/gphoto2.ds/gphoto2_Ko.rc +++ b/dlls/gphoto2.ds/gphoto2_Ko.rc @@ -2,7 +2,7 @@ * Korean resources for Twain * * Copyright 2006 CodeWeavers, Aric Stewart - * Copyright 2006,2007 YunSong Hwang + * Copyright 2006,2007,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,7 +26,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ī�޶�� ʸ�" +CAPTION "ī�޶� �ִ� ��" FONT 9, "MS Shell Dlg" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | @@ -43,7 +43,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTE CAPTION "�ű�� " FONT 9, "MS Shell Dlg" BEGIN - LTEXT "�ű�� ...��ø� ��ٸ��ʽÿ�",IDC_STATIC,5,19,176,8, SS_CENTER + LTEXT "�ű�� ... ��ø� ��ٸ��ʽÿ�",IDC_STATIC,5,19,176,8, SS_CENTER END IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 @@ -52,6 +52,6 @@ CAPTION "ī FONT 9, "MS Shell Dlg" BEGIN CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 - LTEXT "ī�޶��ϰ� ��... ��ø� ��ٸ��ʽÿ�",IDC_STATIC,128,58, - 116,8 + LTEXT "ī�޶��ϰ� ��... ��ø� ��ٸ��ʽÿ�",IDC_STATIC,128,58, + 134,8 END

1 0

Hwang YunSong : comctl32: Update Korean resource.
by Alexandre Julliard June 21, 2010

June 21, 2010

Module: wine Branch: master Commit: 40200a404d3b7ffcd1a37eb50e268d7da260ee54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40200a404d3b7ffcd1a37eb50… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jun 21 10:29:46 2010 +0900 comctl32: Update Korean resource. --- dlls/comctl32/comctl_Ko.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/comctl_Ko.rc b/dlls/comctl32/comctl_Ko.rc index daf9917..4f9ec0a 100644 --- a/dlls/comctl32/comctl_Ko.rc +++ b/dlls/comctl32/comctl_Ko.rc @@ -1,6 +1,6 @@ /* * Copyright 2002 Won-kyu Park <wkpark(a)kldp.org> - * Copyright 2005,2007 YunSong Hwang + * Copyright 2005,2007,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -56,10 +56,10 @@ CAPTION " FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "�ݱ�(&C)", IDCANCEL,308,6,44,14 - PUSHBUTTON "�ٽ�(&E)", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "�缳��(&E)", IDC_RESET_BTN,308,23,44,14 PUSHBUTTON "��(&H)", IDC_HELP_BTN,308,40,44,14 PUSHBUTTON "�� ̵�(&U)", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "�Ʒ��̵�(&D)", IDC_MOVEDN_BTN,308,91,49,14 + PUSHBUTTON "�Ʒ�� ̵�(&D)", IDC_MOVEDN_BTN,308,91,49,14 LTEXT "�� ư(&V)", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "��ϱ�(&A) ->", IDOK, 131, 42, 44, 14

1 0

Peter Davies : winegcc: Enable the use of gcov and PGO.
by Alexandre Julliard June 21, 2010

June 21, 2010

Module: wine Branch: master Commit: 1b23130d746f86173a95d0882b5728e664ea5986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b23130d746f86173a95d0882… Author: Peter Davies <ultratwo(a)gmail.com> Date: Sun Jun 20 12:28:34 2010 +0100 winegcc: Enable the use of gcov and PGO. --- tools/winegcc/winegcc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 40f44c3..5fed4a3 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1003,7 +1003,7 @@ static int is_linker_arg(const char* arg) { "-nostartfiles", "-nodefaultlibs", "-nostdlib", "-s", "-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic", - "-framework" + "-framework", "--coverage", "-fprofile-generate", "-fprofile-use" }; unsigned int j;

1 0

André Hentschel : cmd: Update German translation.
by Alexandre Julliard June 21, 2010

June 21, 2010

Module: wine Branch: master Commit: ab87f82f468f44566d28fc551f9abb1d4fa8f9e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab87f82f468f44566d28fc551… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 20 16:05:17 2010 +0200 cmd: Update German translation. --- programs/cmd/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index 2e83338..b6ca7bc 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -121,7 +121,7 @@ Laufwerken sind.\n" "PATH ändert oder zeigt den CMD Suchpfad an.\n\ \n\ Nach der Eingabe von PATH, wird die aktuelle PATH Einstellung angezeigt\n\ -(nach dem Start wird der Wert aus der wine.conf Datei genommen). Um die\n\ +(nach dem Start wird der Wert aus der Registry genommen). Um die\n\ Einstellungen zu ändern, muss nach dem PATH Befehl der neue Wert angegeben\n\ werden\n\ \n\

1 0

Frédéric Delanoy : cmd: Initial PATH value taken from registry, not wine.conf.
by Alexandre Julliard June 21, 2010

June 21, 2010

Module: wine Branch: master Commit: a758a67a8cb5c6d07899fa73d880383590ac04e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a758a67a8cb5c6d07899fa73d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jun 20 01:22:26 2010 +0200 cmd: Initial PATH value taken from registry, not wine.conf. --- programs/cmd/En.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/En.rc b/programs/cmd/En.rc index 97f4640..dfc807e 100644 --- a/programs/cmd/En.rc +++ b/programs/cmd/En.rc @@ -112,8 +112,8 @@ MOVE fails if the old and new locations are on different DOS drive letters.\n" WCMD_PATH, "PATH displays or changes the cmd search path.\n\ \n\ -Entering PATH will display the current PATH setting (initially this is\n\ -the value given in your wine.conf file). To change the setting follow the\n\ +Entering PATH will display the current PATH setting (initially taken\n\ +from the registry). To change the setting follow the\n\ PATH command with the new value.\n\ \n\ It is also possible to modify the PATH by using the PATH environment\n\

1 0

André Hentschel : winedump: Update README.
by Alexandre Julliard June 21, 2010

June 21, 2010

Module: wine Branch: master Commit: cccad9d97b9615224a0cd30336b76d7df71633f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cccad9d97b9615224a0cd3033… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 20 16:04:58 2010 +0200 winedump: Update README. --- tools/winedump/README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/README b/tools/winedump/README index b1ef087..a6bb59b 100644 --- a/tools/winedump/README +++ b/tools/winedump/README @@ -450,5 +450,5 @@ Please send questions and bug reports to jon_p_griffiths(a)yahoo.com. References ---------- -[1] See the wine and wine.conf man pages for details on how to tell Wine +[1] See the wine man page for details on how to tell Wine whether to use native (Win32) or internal DLL's.

1 0

Juan Lang : wincrypt.h: Remove duplicate definitions.
by Alexandre Julliard June 21, 2010

June 21, 2010

Module: wine Branch: master Commit: 3d73c466ca5a3a799f003387f889507b8d1afa76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d73c466ca5a3a799f003387f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jun 18 12:20:01 2010 -0700 wincrypt.h: Remove duplicate definitions. --- include/wincrypt.h | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index d3f56b9..39c098a 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3007,7 +3007,12 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define szOID_AUTO_ENROLL_CTL_USAGE "1.3.6.1.4.1.311.20.1" #define szOID_ENROLL_CERTTYPE_EXTENSION "1.3.6.1.4.1.311.20.2" #define szOID_ENROLLMENT_AGENT "1.3.6.1.4.1.311.20.2.1" +#ifndef szOID_KP_SMARTCARD_LOGON #define szOID_KP_SMARTCARD_LOGON "1.3.6.1.4.1.311.20.2.2" +#endif +#ifndef szOID_NT_PRINCIPAL_NAME +#define szOID_NT_PRINCIPAL_NAME "1.3.6.1.4.1.311.20.2.3" +#endif #define szOID_CERT_MANIFOLD "1.3.6.1.4.1.311.20.3" #ifndef szOID_CERTSRV_CA_VERSION #define szOID_CERTSRV_CA_VERSION "1.3.6.1.4.1.311.21.1" @@ -3079,21 +3084,6 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define szOID_SERIALIZED "1.3.6.1.4.1.311.10.3.3.1" #endif -#define szOID_AUTO_ENROLL_CTL_USAGE "1.3.6.1.4.1.311.20.1" -#define szOID_ENROLL_CERTTYPE_EXTENSION "1.3.6.1.4.1.311.20.2" -#define szOID_ENROLLMENT_AGENT "1.3.6.1.4.1.311.20.2.1" -#ifndef szOID_KP_SMARTCARD_LOGON -#define szOID_KP_SMARTCARD_LOGON "1.3.6.1.4.1.311.20.2.2" -#endif -#ifndef szOID_NT_PRINCIPAL_NAME -#define szOID_NT_PRINCIPAL_NAME "1.3.6.1.4.1.311.20.2.3" -#endif -#define szOID_CERT_MANIFOLD "1.3.6.1.4.1.311.20.3" - -#ifndef szOID_CERTSRV_CA_VERSION -#define szOID_CERTSRV_CA_VERSION "1.3.6.1.4.1.311.21.1" -#endif - #ifndef szOID_PRODUCT_UPDATE #define szOID_PRODUCT_UPDATE "1.3.6.1.4.1.311.31.1" #endif

1 0

Luca Bennati : kernel32: Update Italian translation.
by Alexandre Julliard June 21, 2010

June 21, 2010

Module: wine Branch: master Commit: 8e55a610b6199cb5af0652e5f133444b95faabe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e55a610b6199cb5af0652e5f… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Jun 19 12:28:15 2010 +0200 kernel32: Update Italian translation. --- .gitignore | 1 + dlls/kernel32/Makefile.in | 1 + dlls/kernel32/nls/ita.nls | 32 +- dlls/kernel32/nls/winerr_ita.mc | 3737 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 3755 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e55a610b6199cb5af065…

1 0

Nikolay Sivov : msxml3: Don't force parser encoding when loading from file.
by Alexandre Julliard June 21, 2010

June 21, 2010

Module: wine Branch: master Commit: c4852be28e6fefd7df9b3166ec13564e3695b478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4852be28e6fefd7df9b3166e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 20 13:47:39 2010 +0400 msxml3: Don't force parser encoding when loading from file. --- dlls/msxml3/domdoc.c | 10 +++++----- dlls/msxml3/node.c | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 34be70c..4808e4e 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -141,14 +141,14 @@ static xmldoc_priv * create_priv(void) return priv; } -static xmlDocPtr doparse( char *ptr, int len ) +static xmlDocPtr doparse( char *ptr, int len, const char *encoding ) { #ifdef HAVE_XMLREADMEMORY /* * use xmlReadMemory if possible so we can suppress * writing errors to stderr */ - return xmlReadMemory( ptr, len, NULL, "UTF-8", + return xmlReadMemory( ptr, len, NULL, encoding, XML_PARSE_NOERROR | XML_PARSE_NOWARNING | XML_PARSE_NOBLANKS ); #else return xmlParseMemory( ptr, len ); @@ -1447,7 +1447,7 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) domdoc *This = obj; xmlDocPtr xmldoc; - xmldoc = doparse( ptr, len ); + xmldoc = doparse( ptr, len, NULL ); if(xmldoc) { xmldoc->_private = create_priv(); return attach_xmldoc(&This->node, xmldoc); @@ -1683,9 +1683,9 @@ static HRESULT WINAPI domdoc_loadXML( { *isSuccessful = VARIANT_FALSE; - if ( bstrXML && bstr_to_utf8( bstrXML, &str, &len ) ) + if ( bstrXML && bstr_to_utf8( bstrXML, &str, &len ) ) { - xmldoc = doparse( str, len ); + xmldoc = doparse( str, len, "UTF-8" ); heap_free( str ); if ( !xmldoc ) This->error = E_FAIL; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index e263a2a..31c6e46 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -437,6 +437,7 @@ static HRESULT WINAPI xmlnode_get_firstChild( IXMLDOMNode** firstChild) { xmlnode *This = impl_from_IXMLDOMNode( iface ); + TRACE("(%p)->(%p)\n", This, firstChild); return get_node( This, "firstChild", This->node->children, firstChild ); }

1 0

Dylan Smith : shdocvw: Native RegisterClassEx requires cbSize to be set.
by Alexandre Julliard June 21, 2010

June 21, 2010

Module: wine Branch: master Commit: ec99c8553155afe29ef2c5dcf37160f85bbb5822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec99c8553155afe29ef2c5dcf… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jun 18 17:42:55 2010 -0400 shdocvw: Native RegisterClassEx requires cbSize to be set. --- dlls/shdocvw/iexplore.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 5ef0b36..e4e7618 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -90,6 +90,7 @@ void register_iewindow_class(void) WNDCLASSEXW wc; memset(&wc, 0, sizeof wc); + wc.cbSize = sizeof(wc); wc.style = 0; wc.lpfnWndProc = ie_window_proc; wc.cbClsExtra = 0;

1 0