December 2010 - Wine-commits

Hwang YunSong : credui: Update Korean resource.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 28396d0d41150ca1fa2bb438a7498397fed65d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28396d0d41150ca1fa2bb438a… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Dec 20 11:15:58 2010 +0900 credui: Update Korean resource. --- dlls/credui/credui_Ko.rc | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/credui/credui_Ko.rc b/dlls/credui/credui_Ko.rc index b8d556a..1cc2e4c 100644 --- a/dlls/credui/credui_Ko.rc +++ b/dlls/credui/credui_Ko.rc @@ -2,7 +2,7 @@ * Korean language resource file for Credentials UI * * Copyright 2007 Robert Shearman (for CodeWeavers) - * Copyright 2007 YunSong Hwang-Ȳ��(hys545(a)dreamwiz.com) + * Copyright 2007,2010 YunSong Hwang-황윤성(hys545(a)dreamwiz.com) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,6 +21,8 @@ #include "credui_resources.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG 0, 0, 213, 149 @@ -31,24 +33,24 @@ BEGIN CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, 0,213,37 LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "�� ̸�(&U):",-1,8,62,72,12,SS_CENTERIMAGE + LTEXT "사용자 이름(&U):",-1,8,62,72,12,SS_CENTERIMAGE CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "��ȣ(&P):",-1,8,80,72,12,SS_CENTERIMAGE + LTEXT "암호(&P):",-1,8,80,72,12,SS_CENTERIMAGE EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "�� ȣ ��(&R)",IDC_SAVE,"Button", + CONTROL "내 암호 기억(&R)",IDC_SAVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 - DEFPUSHBUTTON "Ȯ��",IDOK,97,128,50,14 - PUSHBUTTON "��",IDCANCEL,156,128,50,14 + DEFPUSHBUTTON "확인",IDOK,97,128,50,14 + PUSHBUTTON "취소",IDCANCEL,156,128,50,14 END STRINGTABLE { - IDS_TITLEFORMAT " %s ��" - IDS_MESSAGEFORMAT " %s ��" - IDS_INCORRECTPASSWORDTITLE "�α׿� ��" - IDS_INCORRECTPASSWORD "�� ̸�� ȣ��\n�ùٸ�� Ȯ��Ͻʽÿ�" - IDS_CAPSLOCKONTITLE "Caps Lock Ŀ��" - IDS_CAPSLOCKON "Caps Lock �� Ŀ�� ȣ�� ߸��Էµ� �� ֽ��ϴ�.\n\n ��ȣ�� Է��ϱ� ��\nŰ�� Caps Lock Ű�� ñ� �ٶ��ϴ�." + IDS_TITLEFORMAT " %s 연결" + IDS_MESSAGEFORMAT " %s 연결중" + IDS_INCORRECTPASSWORDTITLE "로그온 실패" + IDS_INCORRECTPASSWORD "당신의 사용자 이름과 암호가\n올바른지 확인하십시오" + IDS_CAPSLOCKONTITLE "Caps Lock 커짐" + IDS_CAPSLOCKON "Caps Lock 이 커져 있으면 암호가 잘못입력될 수 있습니다.\n\n 암호를 입력하기 전에\n키보드의 Caps Lock 키를 끄시기 바랍니다." }

1 0

Hwang YunSong : crypt32: Update Korean resource.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: e3a5ba5478ee3adab775cd541a23c7db3de5085c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a5ba5478ee3adab775cd541… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Dec 20 11:17:34 2010 +0900 crypt32: Update Korean resource. --- dlls/crypt32/crypt32_Ko.rc | 400 ++++++++++++++++++++++---------------------- 1 files changed, 201 insertions(+), 199 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e3a5ba5478ee3adab775c…

1 0

Detlef Riekenberg : cmd: Add CHOICE builtin with DOS6 to XP commandline parameter.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 7045e478a8bc8a1aeea5306aac47ee80a5b1f0f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7045e478a8bc8a1aeea5306aa… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Dec 19 23:13:32 2010 +0100 cmd: Add CHOICE builtin with DOS6 to XP commandline parameter. --- programs/cmd/En.rc | 5 ++ programs/cmd/builtins.c | 168 +++++++++++++++++++++++++++++++++++++++++++++++ programs/cmd/wcmd.h | 4 +- programs/cmd/wcmdmain.c | 4 + 4 files changed, 180 insertions(+), 1 deletions(-) diff --git a/programs/cmd/En.rc b/programs/cmd/En.rc index 2e32c1c..87b0780 100644 --- a/programs/cmd/En.rc +++ b/programs/cmd/En.rc @@ -211,6 +211,10 @@ PUSHD.\n" WCMD_MORE, "MORE displays output of files or piped input in pages.\n" + WCMD_CHOICE, "CHOICE displays a text and waits, until the User\n\ +press an allowed Key from a selectable list.\n\ +CHOICE is mainly used to build a menu selection in a batch file.\n" + WCMD_EXIT, "EXIT terminates the current command session and returns\n\ to the operating system or shell from which you invoked cmd.\n" @@ -219,6 +223,7 @@ to the operating system or shell from which you invoked cmd.\n" ATTRIB\t\tShow or change DOS file attributes\n\ CALL\t\tInvoke a batch file from inside another\n\ CD (CHDIR)\tChange current default directory\n\ +CHOICE\t\tWait for an keypress from a selectable list\n\ CLS\t\tClear the console screen\n\ COPY\t\tCopy file\n\ CTTY\t\tChange input/output device\n\ diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8c3f727..7c35e6a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -160,6 +160,174 @@ void WCMD_change_tty (void) { } /**************************************************************************** + * WCMD_choice + * + */ + +void WCMD_choice (WCHAR * command) { + + static const WCHAR bellW[] = {7,0}; + static const WCHAR commaW[] = {',',0}; + static const WCHAR bracket_open[] = {'[',0}; + static const WCHAR bracket_close[] = {']','?',0}; + WCHAR answer[16]; + WCHAR buffer[16]; + WCHAR *ptr = NULL; + WCHAR *opt_c = NULL; + WCHAR *my_command = NULL; + WCHAR opt_default = 0; + DWORD opt_timeout = 0; + DWORD count; + DWORD oldmode; + DWORD have_console; + BOOL opt_n = FALSE; + BOOL opt_s = FALSE; + + have_console = GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &oldmode); + errorlevel = 0; + + my_command = WCMD_strdupW(WCMD_strtrim_leading_spaces(command)); + if (!my_command) + return; + + ptr = WCMD_strtrim_leading_spaces(my_command); + while (*ptr == '/') { + switch (toupperW(ptr[1])) { + case 'C': + ptr += 2; + /* the colon is optional */ + if (*ptr == ':') + ptr++; + + if (!*ptr || isspaceW(*ptr)) { + WINE_FIXME("bad parameter %s for /C\n", wine_dbgstr_w(ptr)); + HeapFree(GetProcessHeap(), 0, my_command); + return; + } + + /* remember the allowed keys (overwrite previous /C option) */ + opt_c = ptr; + while (*ptr && (!isspaceW(*ptr))) + ptr++; + + if (*ptr) { + /* terminate allowed chars */ + *ptr = 0; + ptr = WCMD_strtrim_leading_spaces(&ptr[1]); + } + WINE_TRACE("answer-list: %s\n", wine_dbgstr_w(opt_c)); + break; + + case 'N': + opt_n = TRUE; + ptr = WCMD_strtrim_leading_spaces(&ptr[2]); + break; + + case 'S': + opt_s = TRUE; + ptr = WCMD_strtrim_leading_spaces(&ptr[2]); + break; + + case 'T': + ptr = &ptr[2]; + /* the colon is optional */ + if (*ptr == ':') + ptr++; + + opt_default = *ptr++; + + if (!opt_default || (*ptr != ',')) { + WINE_FIXME("bad option %s for /T\n", opt_default ? wine_dbgstr_w(ptr) : ""); + HeapFree(GetProcessHeap(), 0, my_command); + return; + } + ptr++; + + count = 0; + while (((answer[count] = *ptr)) && isdigitW(*ptr) && (count < 15)) { + count++; + ptr++; + } + + answer[count] = 0; + opt_timeout = atoiW(answer); + + ptr = WCMD_strtrim_leading_spaces(ptr); + break; + + default: + WINE_FIXME("bad parameter: %s\n", wine_dbgstr_w(ptr)); + HeapFree(GetProcessHeap(), 0, my_command); + return; + } + } + + if (opt_timeout) + WINE_FIXME("timeout not supported: %c,%d\n", opt_default, opt_timeout); + + if (have_console) + SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), 0); + + /* use default keys, when needed: localized versions of "Y"es and "No" */ + if (!opt_c) { + LoadStringW(hinst, WCMD_YES, buffer, sizeof(buffer)/sizeof(WCHAR)); + LoadStringW(hinst, WCMD_NO, buffer + 1, sizeof(buffer)/sizeof(WCHAR) - 1); + opt_c = buffer; + buffer[2] = 0; + } + + /* print the question, when needed */ + if (*ptr) + WCMD_output_asis(ptr); + + if (!opt_s) { + struprW(opt_c); + WINE_TRACE("case insensitive answer-list: %s\n", wine_dbgstr_w(opt_c)); + } + + if (!opt_n) { + /* print a list of all allowed answers inside brackets */ + WCMD_output_asis(bracket_open); + ptr = opt_c; + answer[1] = 0; + while ((answer[0] = *ptr++)) { + WCMD_output_asis(answer); + if (*ptr) + WCMD_output_asis(commaW); + } + WCMD_output_asis(bracket_close); + } + + while (TRUE) { + + /* FIXME: Add support for option /T */ + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, 1, &count, NULL); + + if (!opt_s) + answer[0] = toupperW(answer[0]); + + ptr = strchrW(opt_c, answer[0]); + if (ptr) { + WCMD_output_asis(answer); + WCMD_output(newline); + if (have_console) + SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), oldmode); + + errorlevel = (ptr - opt_c) + 1; + WINE_TRACE("answer: %d\n", errorlevel); + HeapFree(GetProcessHeap(), 0, my_command); + return; + } + else + { + /* key not allowed: play the bell */ + WINE_TRACE("key not allowed: %s\n", wine_dbgstr_w(answer)); + WCMD_output_asis(bellW); + } + } +} + +/**************************************************************************** * WCMD_copy * * Copy a file or wildcarded set. diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 2fde678..ce4c2da 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -52,6 +52,7 @@ void WCMD_assoc (WCHAR *, BOOL); void WCMD_batch (WCHAR *, WCHAR *, int, WCHAR *, HANDLE); void WCMD_call (WCHAR *command); void WCMD_change_tty (void); +void WCMD_choice (WCHAR *); void WCMD_clear_screen (void); void WCMD_color (void); void WCMD_copy (void); @@ -202,9 +203,10 @@ typedef struct _DIRECTORY_STACK #define WCMD_COLOR 41 #define WCMD_FTYPE 42 #define WCMD_MORE 43 +#define WCMD_CHOICE 44 /* Must be last in list */ -#define WCMD_EXIT 44 +#define WCMD_EXIT 45 /* Some standard messages */ extern const WCHAR newline[]; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 85f78b8..7b7ce8f 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -76,6 +76,7 @@ const WCHAR inbuilt[][10] = { {'C','O','L','O','R','\0'}, {'F','T','Y','P','E','\0'}, {'M','O','R','E','\0'}, + {'C','H','O','I','C','E','\0'}, {'E','X','I','T','\0'} }; @@ -1543,6 +1544,9 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, case WCMD_MORE: WCMD_more(p); break; + case WCMD_CHOICE: + WCMD_choice(p); + break; case WCMD_EXIT: WCMD_exit (cmdList); break;

1 0

Detlef Riekenberg : cmd: Add german translation for CHOICE.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 7506d41e75c283b42fa421d88067ccffb744d571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7506d41e75c283b42fa421d88… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Dec 19 23:13:33 2010 +0100 cmd: Add german translation for CHOICE. --- programs/cmd/De.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index 157bc4f..8b4bfb3 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -228,6 +228,10 @@ mit PUSHD gespeicherten.\n" WCMD_MORE, "MORE gibt Dateien und Pipes seitenweise aus.\n" + WCMD_CHOICE, "CHOICE zeigt einen Text auf dem Bildschirm an und wartet,\n\ +bis der Benutzer eine erlaubte Taste aus einer wählbaren Liste drückt.\n\ +CHOICE wird hauptsächlich als Menüauswahl in einer Batchdatei genutzt.\n" + WCMD_EXIT, "EXIT beendet die aktuelle Befehlssitzung und kehrt zum\n\ Betriebssystem oder der Shell zurück, von der CMD gestart wurde.\n" @@ -237,6 +241,7 @@ Betriebssystem oder der Shell zurück, von der CMD gestart wurde.\n" ATTRIB\t\tZeigt oder ändert die DOS Dateieigenschaften\n\ CALL\t\tRuft eine Batch-Datei innerhalb einer anderen auf\n\ CD (CHDIR)\tWechselt in ein Verzeichnis\n\ +CHOICE\t\tWartet auf einen Tastendruck aus einer wählbaren Liste\n\ CLS\t\tLöscht den Inhalt der Konsole\n\ COPY\t\tKopiert eine Datei\n\ CTTY\t\tÄndert das Eingabe/Ausgabe - Gerät\n\

1 0

Detlef Riekenberg : cmd: Do not reset errorlevel during SET.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: f29674e86fa6f80d15ede6ad1abdf6168187096f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f29674e86fa6f80d15ede6ad1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Dec 19 23:13:34 2010 +0100 cmd: Do not reset errorlevel during SET. --- programs/cmd/builtins.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7c35e6a..944a997 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2265,7 +2265,6 @@ void WCMD_setshow_env (WCHAR *s) { int status; static const WCHAR parmP[] = {'/','P','\0'}; - errorlevel = 0; if (param1[0] == 0x00 && quals[0] == 0x00) { env = GetEnvironmentStringsW(); WCMD_setshow_sortenv( env, NULL );

1 0

Huw Davies : ole32: Remove some useless comments.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 861bb8ee1355ba0d6649b01fbeaf87818ab4f98a URL: http://source.winehq.org/git/wine.git/?a=commit;h=861bb8ee1355ba0d6649b01fb… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 17 11:51:47 2010 +0000 ole32: Remove some useless comments. --- dlls/ole32/oleobj.c | 72 +++------------------------------------------------ 1 files changed, 4 insertions(+), 68 deletions(-) diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 6b4106a..ff77f5b 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -274,9 +274,7 @@ static HRESULT WINAPI OleAdviseHolderImpl_QueryInterface( { OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface; TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvObj); - /* - * Sanity check - */ + if (ppvObj==NULL) return E_POINTER; @@ -284,21 +282,16 @@ static HRESULT WINAPI OleAdviseHolderImpl_QueryInterface( if (IsEqualIID(riid, &IID_IUnknown)) { - /* IUnknown */ *ppvObj = This; } else if(IsEqualIID(riid, &IID_IOleAdviseHolder)) { - /* IOleAdviseHolder */ *ppvObj = This; } if(*ppvObj == NULL) return E_NOINTERFACE; - /* - * A successful QI always increments the reference count. - */ IUnknown_AddRef((IUnknown*)*ppvObj); return S_OK; @@ -348,26 +341,17 @@ static HRESULT WINAPI OleAdviseHolderImpl_Advise( TRACE("(%p)->(%p, %p)\n", This, pAdvise, pdwConnection); - /* - * Sanity check - */ if (pdwConnection==NULL) return E_POINTER; *pdwConnection = 0; - /* - * Find a free spot in the array. - */ for (index = 0; index < This->maxSinks; index++) { if (This->arrayOfSinks[index]==NULL) break; } - /* - * If the array is full, we need to grow it. - */ if (index == This->maxSinks) { DWORD i; @@ -383,9 +367,6 @@ static HRESULT WINAPI OleAdviseHolderImpl_Advise( This->arrayOfSinks[i]=0; } - /* - * Store the new sink - */ This->arrayOfSinks[index] = pAdvise; if (This->arrayOfSinks[index]!=NULL) @@ -651,8 +632,6 @@ static void DataAdviseHolder_Destructor(DataAdviseHolder* ptrToDestroy) /************************************************************************ * DataAdviseHolder_QueryInterface (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. */ static HRESULT WINAPI DataAdviseHolder_QueryInterface( IDataAdviseHolder* iface, @@ -661,47 +640,29 @@ static HRESULT WINAPI DataAdviseHolder_QueryInterface( { DataAdviseHolder *This = (DataAdviseHolder *)iface; TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvObject); - /* - * Perform a sanity check on the parameters. - */ + if ( (This==0) || (ppvObject==0) ) return E_INVALIDARG; - /* - * Initialize the return parameter. - */ *ppvObject = 0; - /* - * Compare the riid with the interface IDs implemented by this object. - */ if ( IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IDataAdviseHolder, riid) ) { *ppvObject = iface; } - /* - * Check that we obtained an interface. - */ if ((*ppvObject)==0) { return E_NOINTERFACE; } - /* - * Query Interface always increases the reference count by one when it is - * successful. - */ IUnknown_AddRef((IUnknown*)*ppvObject); - return S_OK; } /************************************************************************ * DataAdviseHolder_AddRef (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. */ static ULONG WINAPI DataAdviseHolder_AddRef( IDataAdviseHolder* iface) @@ -713,8 +674,6 @@ static ULONG WINAPI DataAdviseHolder_AddRef( /************************************************************************ * DataAdviseHolder_Release (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. */ static ULONG WINAPI DataAdviseHolder_Release( IDataAdviseHolder* iface) @@ -723,14 +682,7 @@ static ULONG WINAPI DataAdviseHolder_Release( ULONG ref; TRACE("(%p) (ref=%d)\n", This, This->ref); - /* - * Decrease the reference count on this object. - */ ref = InterlockedDecrement(&This->ref); - - /* - * If the reference count goes down to 0, perform suicide. - */ if (ref==0) DataAdviseHolder_Destructor(This); return ref; @@ -754,26 +706,18 @@ static HRESULT WINAPI DataAdviseHolder_Advise( TRACE("(%p)->(%p, %p, %08x, %p, %p)\n", This, pDataObject, pFetc, advf, pAdvise, pdwConnection); - /* - * Sanity check - */ + if (pdwConnection==NULL) return E_POINTER; *pdwConnection = 0; - /* - * Find a free spot in the array. - */ for (index = 0; index < This->maxCons; index++) { if (This->Connections[index].sink == NULL) break; } - /* - * If the array is full, we need to grow it. - */ if (index == This->maxCons) { This->maxCons+=INITIAL_SINKS; @@ -781,9 +725,7 @@ static HRESULT WINAPI DataAdviseHolder_Advise( This->Connections, This->maxCons*sizeof(DataAdviseConnection)); } - /* - * Store the new sink - */ + This->Connections[index].sink = pAdvise; This->Connections[index].advf = advf & ~WINE_ADVF_REMOTE; This->Connections[index].fmat = *pFetc; @@ -1010,9 +952,6 @@ HRESULT WINAPI CreateOleAdviseHolder( { TRACE("(%p)\n", ppOAHolder); - /* - * Sanity check, - */ if (ppOAHolder==NULL) return E_POINTER; @@ -1032,9 +971,6 @@ HRESULT WINAPI CreateDataAdviseHolder( { TRACE("(%p)\n", ppDAHolder); - /* - * Sanity check, - */ if (ppDAHolder==NULL) return E_POINTER;

1 0

Huw Davies : ole32: Use a STATDATA array to hold the connection data.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 892796a9a64c363844500d9e7ca0d39de9169166 URL: http://source.winehq.org/git/wine.git/?a=commit;h=892796a9a64c363844500d9e7… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 17 13:13:17 2010 +0000 ole32: Use a STATDATA array to hold the connection data. --- dlls/ole32/oleobj.c | 161 +++++++++++++++++++++----------------------------- 1 files changed, 68 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=892796a9a64c363844500…

1 0

Huw Davies : ole32: Allow the EnumSTATDATA constructor to take a sparse array.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 4151b49fad459663734d358161c2fc10dfd0e0e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4151b49fad459663734d35816… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 17 14:07:19 2010 +0000 ole32: Allow the EnumSTATDATA constructor to take a sparse array. --- dlls/ole32/oleobj.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 2441121..2b0179c 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -80,7 +80,7 @@ typedef struct OleAdviseHolderImpl } OleAdviseHolderImpl; -static HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD num, STATDATA *data, IEnumSTATDATA **ppenum); +static HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, IEnumSTATDATA **ppenum); typedef struct { @@ -207,11 +207,11 @@ static const IEnumSTATDATAVtbl EnumSTATDATA_VTable = EnumSTATDATA_Clone }; -static HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD num, STATDATA *data, +static HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, IEnumSTATDATA **ppenum) { EnumSTATDATA *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - DWORD i; + DWORD i, count; if (!This) return E_OUTOFMEMORY; @@ -219,17 +219,23 @@ static HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD num, This->ref = 1; This->index = index; - This->statdata = HeapAlloc(GetProcessHeap(), 0, num * sizeof(*This->statdata)); + This->statdata = HeapAlloc(GetProcessHeap(), 0, array_len * sizeof(*This->statdata)); if(!This->statdata) { HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; } - for(i = 0; i < num; i++) - copy_statdata(This->statdata + i, data + i); + for(i = 0, count = 0; i < array_len; i++) + { + if(data[i].pAdvSink) + { + copy_statdata(This->statdata + count, data + i); + count++; + } + } - This->num_of_elems = num; + This->num_of_elems = count; This->holder = holder; IUnknown_AddRef(holder); *ppenum = &This->IEnumSTATDATA_iface;

1 0

Huw Davies : ole32: Implement IDataAdviseHolder_EnumAdvise.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 06f2ef4fb5da8de263e74ce50e27f24ddef8ba6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f2ef4fb5da8de263e74ce50… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 17 14:13:03 2010 +0000 ole32: Implement IDataAdviseHolder_EnumAdvise. --- dlls/ole32/oleobj.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 2b0179c..a395557 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -792,14 +792,22 @@ static HRESULT WINAPI DataAdviseHolder_Unadvise( return S_OK; } -static HRESULT WINAPI DataAdviseHolder_EnumAdvise( - IDataAdviseHolder* iface, - IEnumSTATDATA** ppenumAdvise) +/****************************************************************************** + * DataAdviseHolder_EnumAdvise + */ +static HRESULT WINAPI DataAdviseHolder_EnumAdvise(IDataAdviseHolder *iface, + IEnumSTATDATA **enum_advise) { - DataAdviseHolder *This = (DataAdviseHolder *)iface; + DataAdviseHolder *This = (DataAdviseHolder *)iface; + IUnknown *unk; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, enum_advise); - FIXME("(%p)->(%p)\n", This, ppenumAdvise); - return E_NOTIMPL; + IDataAdviseHolder_QueryInterface(iface, &IID_IUnknown, (void**)&unk); + hr = EnumSTATDATA_Construct(unk, 0, This->maxCons, This->connections, enum_advise); + IUnknown_Release(unk); + return hr; } /******************************************************************************

1 0

Huw Davies : ole32: Standardize the COM usage.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 3a2aae49d395fb4d90a018af5811b8e35119bd21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2aae49d395fb4d90a018af5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 17 14:58:32 2010 +0000 ole32: Standardize the COM usage. --- dlls/ole32/oleobj.c | 186 +++++++++++++++++++++++--------------------------- 1 files changed, 86 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a2aae49d395fb4d90a01…

1 0