wine-commits December 2014

wine-commits@winehq.org

2 participants
319 discussions

André Hentschel : msi/tests: Remove unused variables (Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 1c3179b21b0f2935e6f0803cda95547919ffff88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c3179b21b0f2935e6f0803cd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:57:30 2014 +0100 msi/tests: Remove unused variables (Clang). --- dlls/msi/tests/install.c | 56 ------------------------------------------------ 1 file changed, 56 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a99a4c4..7c4544a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -563,35 +563,11 @@ static const CHAR cie_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\t "2\t2\t\ttest2.cab\tDISK2\t\n" "3\t12\t\ttest3.cab\tDISK3\t\n"; -static const CHAR ci_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" - "s72\tS255\tI2\n" - "InstallExecuteSequence\tAction\n" - "CostFinalize\t\t1000\n" - "CostInitialize\t\t800\n" - "FileCost\t\t900\n" - "InstallFiles\t\t4000\n" - "InstallServices\t\t5000\n" - "InstallFinalize\t\t6600\n" - "InstallInitialize\t\t1500\n" - "RunInstall\t\t1600\n" - "InstallValidate\t\t1400\n" - "LaunchConditions\t\t100"; - -static const CHAR ci_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" - "s72\ti2\tS64\tS0\tS255\n" - "CustomAction\tAction\n" - "RunInstall\t87\tmsitest\\concurrent.msi\tMYPROP=[UILevel]\t\n"; - static const CHAR ci_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" "Component\tComponent\n" "maximus\t{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}\tMSITESTDIR\t0\tUILevel=5\tmaximus\n"; -static const CHAR ci2_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" - "s72\tS38\ts72\ti2\tS255\tS72\n" - "Component\tComponent\n" - "augustus\t\tMSITESTDIR\t0\tUILevel=3 AND MYPROP=5\taugustus\n"; - static const CHAR ci2_feature_comp_dat[] = "Feature_\tComponent_\n" "s38\ts72\n" "FeatureComponents\tFeature_\tComponent_\n" @@ -659,13 +635,6 @@ static const CHAR amp_component_dat[] = "Component\tComponentId\tDirectory_\tAtt "Component\tComponent\n" "augustus\t\tMSITESTDIR\t0\tMYPROP=2718 and MyProp=42\taugustus\n"; -static const CHAR rem_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" - "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" - "File\tFile\n" - "hydrogen\thydrogen\thydrogen\t0\t\t\t8192\t1\n" - "helium\thelium\thelium\t0\t\t\t8192\t1\n" - "lithium\tlithium\tlithium\t0\t\t\t8192\t1"; - static const CHAR rem_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" "InstallExecuteSequence\tAction\n" @@ -1543,31 +1512,6 @@ static const msi_table cie_tables[] = ADD_TABLE(property), }; -static const msi_table ci_tables[] = -{ - ADD_TABLE(ci_component), - ADD_TABLE(directory), - ADD_TABLE(rof_feature), - ADD_TABLE(rof_feature_comp), - ADD_TABLE(rof_file), - ADD_TABLE(ci_install_exec_seq), - ADD_TABLE(rof_media), - ADD_TABLE(property), - ADD_TABLE(ci_custom_action), -}; - -static const msi_table ci2_tables[] = -{ - ADD_TABLE(ci2_component), - ADD_TABLE(directory), - ADD_TABLE(rof_feature), - ADD_TABLE(ci2_feature_comp), - ADD_TABLE(ci2_file), - ADD_TABLE(install_exec_seq), - ADD_TABLE(rof_media), - ADD_TABLE(property), -}; - static const msi_table tp_tables[] = { ADD_TABLE(tp_component),

1 0

André Hentschel : localspl: Remove unused strings ( Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: f1cd8d4ac9ece36bebc0f7ab3e15edc3e425248d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1cd8d4ac9ece36bebc0f7ab3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:56:19 2014 +0100 localspl: Remove unused strings (Clang). --- dlls/localspl/provider.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 6fc2869..8256c5c 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -99,9 +99,7 @@ static const WCHAR bs_ports_bsW[] = {'\\','P','o','r','t','s','\\',0}; static const WCHAR configuration_fileW[] = {'C','o','n','f','i','g','u','r','a','t','i','o','n',' ','F','i','l','e',0}; static const WCHAR datatypeW[] = {'D','a','t','a','t','y','p','e',0}; static const WCHAR data_fileW[] = {'D','a','t','a',' ','F','i','l','e',0}; -static const WCHAR default_devmodeW[] = {'D','e','f','a','u','l','t',' ','D','e','v','M','o','d','e',0}; static const WCHAR dependent_filesW[] = {'D','e','p','e','n','d','e','n','t',' ','F','i','l','e','s',0}; -static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR driverW[] = {'D','r','i','v','e','r',0}; static const WCHAR emptyW[] = {0}; static const WCHAR fmt_driversW[] = { 'S','y','s','t','e','m','\\', @@ -116,13 +114,10 @@ static const WCHAR fmt_printprocessorsW[] = { 'S','y','s','t','e','m','\\', 'P','r','i','n','t','\\', 'E','n','v','i','r','o','n','m','e','n','t','s','\\','%','s','\\', 'P','r','i','n','t',' ','P','r','o','c','e','s','s','o','r','s',0 }; -static const WCHAR hardwareidW[] = {'H','a','r','d','w','a','r','e','I','D',0}; static const WCHAR help_fileW[] = {'H','e','l','p',' ','F','i','l','e',0}; static const WCHAR ia64_envnameW[] = {'W','i','n','d','o','w','s',' ','I','A','6','4',0}; static const WCHAR ia64_subdirW[] = {'i','a','6','4',0}; static const WCHAR localportW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; -static const WCHAR locationW[] = {'L','o','c','a','t','i','o','n',0}; -static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR monitorW[] = {'M','o','n','i','t','o','r',0}; static const WCHAR monitorsW[] = {'S','y','s','t','e','m','\\', 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -130,10 +125,6 @@ static const WCHAR monitorsW[] = {'S','y','s','t','e','m','\\', 'P','r','i','n','t','\\', 'M','o','n','i','t','o','r','s','\\',0}; static const WCHAR monitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; -static const WCHAR nameW[] = {'N','a','m','e',0}; -static const WCHAR oem_urlW[] = {'O','E','M',' ','U','r','l',0}; -static const WCHAR parametersW[] = {'P','a','r','a','m','e','t','e','r','s',0}; -static const WCHAR portW[] = {'P','o','r','t',0}; static const WCHAR previous_namesW[] = {'P','r','e','v','i','o','u','s',' ','N','a','m','e','s',0}; static const WCHAR printersW[] = {'S','y','s','t','e','m','\\', 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',

1 0

André Hentschel : mshtml/tests: Remove unused variable (Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 93b36efe61c30006b4b2f48a6aba1cc13fa42058 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b36efe61c30006b4b2f48a6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:56:14 2014 +0100 mshtml/tests: Remove unused variable (Clang). --- dlls/mshtml/tests/events.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 7360024..64c0556 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -98,7 +98,6 @@ typedef struct { } xy_test_t; static const xy_test_t no_xy = {-10,-10,-10,-10}; -static const xy_test_t zero_xy = {0,0,0,0}; static const char empty_doc_str[] = "<html></html>";

1 0

André Hentschel : kernel32/tests: Remove unused strings (Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 3135b0254658451e5c83ede2a1b8dcea70e0928e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3135b0254658451e5c83ede2a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:56:10 2014 +0100 kernel32/tests: Remove unused strings (Clang). --- dlls/kernel32/tests/actctx.c | 2 -- dlls/kernel32/tests/file.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index c964743..97e7dd2 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -304,8 +304,6 @@ static const WCHAR wndClass2W[] = {'w','n','d','C','l','a','s','s','2',0}; static const WCHAR wndClass3W[] = {'w','n','d','C','l','a','s','s','3',0}; -static const WCHAR acr_manifest[] = - {'a','c','r','.','m','a','n','i','f','e','s','t',0}; static WCHAR app_dir[MAX_PATH], exe_path[MAX_PATH], work_dir[MAX_PATH], work_dir_subdir[MAX_PATH]; static WCHAR app_manifest_path[MAX_PATH], manifest_path[MAX_PATH], depmanifest_path[MAX_PATH]; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3a30fc2..8849eb3 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -47,9 +47,7 @@ static BOOL (WINAPI *pSetFileValidData)(HANDLE, LONGLONG); static HRESULT (WINAPI *pCopyFile2)(PCWSTR,PCWSTR,COPYFILE2_EXTENDED_PARAMETERS*); static HANDLE (WINAPI *pCreateFile2)(LPCWSTR, DWORD, DWORD, DWORD, CREATEFILE2_EXTENDED_PARAMETERS*); -/* keep filename and filenameW the same */ static const char filename[] = "testfile.xxx"; -static const WCHAR filenameW[] = { 't','e','s','t','f','i','l','e','.','x','x','x',0 }; static const char sillytext[] = "en larvig liten text dx \033 gx hej 84 hej 4484 ! \001\033 bla bl\na.. bla bla." "1234 43 4kljf lf &%%%&&&&&& 34 4 34 3############# 33 3 3 3 # 3## 3"

1 0

Jacek Caban : mshtml: Added support for flag 2 in getAttribute.
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 1454e302a80c218343420a7402da4d6e2dec4c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1454e302a80c218343420a740… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 1 12:55:51 2014 +0100 mshtml: Added support for flag 2 in getAttribute. --- dlls/mshtml/htmlelem.c | 35 +++++++++++++++++++++++++++++++---- dlls/mshtml/tests/jstest.html | 12 ++++++++++++ 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 48fff3f..f81ccee 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -606,6 +606,10 @@ static HRESULT WINAPI HTMLElement_Invoke(IHTMLElement *iface, DISPID dispIdMembe wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } +#define ATTRFLAG_CASESENSITIVE 0x0001 +#define ATTRFLAG_ASSTRING 0x0002 +#define ATTRFLAG_EXPANDURL 0x0004 + static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttributeName, VARIANT AttributeValue, LONG lFlags) { @@ -618,7 +622,7 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr TRACE("(%p)->(%s %s %08x)\n", This, debugstr_w(strAttributeName), debugstr_variant(&AttributeValue), lFlags); hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, strAttributeName, - (lFlags&1 ? fdexNameCaseSensitive : fdexNameCaseInsensitive) | fdexNameEnsure, &dispid); + (lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive) | fdexNameEnsure, &dispid); if(FAILED(hres)) return hres; @@ -647,8 +651,11 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr TRACE("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), lFlags, AttributeValue); + if(lFlags & ~(ATTRFLAG_CASESENSITIVE|ATTRFLAG_ASSTRING)) + FIXME("Unsuported flags %x\n", lFlags); + hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, strAttributeName, - lFlags&1 ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &dispid); + lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &dispid); if(hres == DISP_E_UNKNOWNNAME) { V_VT(AttributeValue) = VT_NULL; return S_OK; @@ -659,8 +666,28 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr return hres; } - return IDispatchEx_InvokeEx(&This->node.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, + hres = IDispatchEx_InvokeEx(&This->node.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYGET, &dispParams, AttributeValue, &excep, NULL); + if(FAILED(hres)) + return hres; + + if(lFlags & ATTRFLAG_ASSTRING) { + switch(V_VT(AttributeValue)) { + case VT_BSTR: + break; + case VT_DISPATCH: + IDispatch_Release(V_DISPATCH(AttributeValue)); + V_VT(AttributeValue) = VT_BSTR; + V_BSTR(AttributeValue) = SysAllocString(NULL); + break; + default: + hres = VariantChangeType(AttributeValue, AttributeValue, 0, VT_BSTR); + if(FAILED(hres)) + return hres; + } + } + + return S_OK; } static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strAttributeName, @@ -673,7 +700,7 @@ static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strA TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(strAttributeName), lFlags, pfSuccess); hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, strAttributeName, - lFlags&1 ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &id); + lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &id); if(hres == DISP_E_UNKNOWNNAME) { *pfSuccess = VARIANT_FALSE; return S_OK; diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 39cdae5..2b3634e 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -148,12 +148,16 @@ function test_attrs() { x = input.getAttribute("style"); ok(x === s, "getAttribute('style') = " + x); ok(s.cssText === "", "s.cssText = " + s.cssText); + x = input.getAttribute("style", 2); + ok(x === "", "getAttribute('style') = " + x); input.setAttribute("style", "display: none"); x = input.getAttribute("style"); ok(x === s, "getAttribute('style') = " + x); ok(s.cssText === "", "s.cssText = " + s.cssText); ok(s.display === "", "s.display = " + s.display); + x = input.getAttribute("style", 2); + ok(x === "", "getAttribute('style') = " + x); s.display = "none"; ok(s.cssText != "", "s.cssText = " + s.cssText); @@ -163,6 +167,8 @@ function test_attrs() { ok(x === s, "getAttribute('style') = " + x); ok(s.cssText != "", "s.cssText = " + s.cssText); ok(s.display === "none", "s.display = " + s.display); + x = input.getAttribute("style", 2); + ok(x === "", "getAttribute('style') = " + x); input.setAttribute("style", null); x = input.getAttribute("style"); @@ -173,11 +179,15 @@ function test_attrs() { x = input.getAttribute("fireEvent"); ok(x === input.fireEvent, "input.getAttribute('fireEvent') = " + x); + x = input.getAttribute("fireEvent", 2); + ok(x === "", "getAttribute('fireEvent') = " + x); input.setAttribute("fireEvent", 3); ok(input.fireEvent === 3, "input.fireEvent = " + input.fireEvent); x = input.getAttribute("fireEvent"); ok(x === 3, "input.getAttribute('fireEvent') = " + x); + x = input.getAttribute("fireEvent", 2); + ok(x === "3", "getAttribute('fireEvent') = " + x); b = input.removeAttribute("style"); ok(b === true, "removeAttribute('style') failed"); @@ -186,6 +196,8 @@ function test_attrs() { ok(x === s, "getAttribute('style') = " + x); ok(s.display === "", "s.display = " + s.display); ok(s.cssText === "", "s.cssText = " + s.cssText); + x = input.getAttribute("style", 2); + ok(x === "", "getAttribute('style') = " + x); b = input.removeAttribute("style"); ok(b === true, "removeAttribute('style') failed");

1 0

Jacek Caban : mshtml: Added "indent" command support to execCommand.
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 71cb0cea7442440cc9ea3cf142255e9c261c01a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71cb0cea7442440cc9ea3cf14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 1 12:55:34 2014 +0100 mshtml: Added "indent" command support to execCommand. --- dlls/mshtml/htmldoc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index edc91e6..7a577d9 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1098,6 +1098,8 @@ static HRESULT WINAPI HTMLDocument_clear(IHTMLDocument2 *iface) static const WCHAR fontnameW[] = {'f','o','n','t','n','a','m','e',0}; +static const WCHAR indentW[] = + {'i','n','d','e','n','t',0}; static const WCHAR insertorderedlistW[] = {'i','n','s','e','r','t','o','r','d','e','r','e','d','l','i','s','t',0}; static const WCHAR insertunorderedlistW[] = @@ -1112,6 +1114,7 @@ static const struct { OLECMDID id; }command_names[] = { {fontnameW, IDM_FONTNAME}, + {indentW, IDM_INDENT}, {insertorderedlistW, IDM_ORDERLIST}, {insertunorderedlistW, IDM_UNORDERLIST}, {outdentW, IDM_OUTDENT},

1 0

Iván Matellanes : msvcrt: Call the _nolock variant when the file is already locked.
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 17fcef507f8c05f2ae45b2b47c091f8e6e6582d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17fcef507f8c05f2ae45b2b47… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Nov 28 20:48:31 2014 +0100 msvcrt: Call the _nolock variant when the file is already locked. --- dlls/msvcrt/file.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b0f8735..5176f58 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1417,7 +1417,7 @@ void CDECL MSVCRT_rewind(MSVCRT_FILE* file) TRACE(":file (%p) fd (%d)\n",file,file->_file); MSVCRT__lock_file(file); - MSVCRT_fseek(file, 0L, SEEK_SET); + MSVCRT__fseek_nolock(file, 0L, SEEK_SET); MSVCRT_clearerr(file); MSVCRT__unlock_file(file); } @@ -3586,7 +3586,7 @@ char * CDECL MSVCRT_fgets(char *s, int size, MSVCRT_FILE* file) MSVCRT__lock_file(file); - while ((size >1) && (cc = MSVCRT_fgetc(file)) != MSVCRT_EOF && cc != '\n') + while ((size >1) && (cc = MSVCRT__fgetc_nolock(file)) != MSVCRT_EOF && cc != '\n') { *s++ = (char)cc; size --; @@ -3676,7 +3676,7 @@ int CDECL MSVCRT__getw(MSVCRT_FILE* file) MSVCRT__lock_file(file); for (j=0; j<sizeof(int); j++) { - k = MSVCRT_fgetc(file); + k = MSVCRT__fgetc_nolock(file); if (k == MSVCRT_EOF) { file->_flag |= MSVCRT__IOEOF; MSVCRT__unlock_file(file); @@ -3726,7 +3726,7 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f MSVCRT__lock_file(file); - while ((size >1) && (cc = MSVCRT_fgetwc(file)) != MSVCRT_WEOF && cc != '\n') + while ((size >1) && (cc = MSVCRT__fgetwc_nolock(file)) != MSVCRT_WEOF && cc != '\n') { *s++ = cc; size --; @@ -4452,7 +4452,7 @@ int CDECL MSVCRT_fputs(const char *s, MSVCRT_FILE* file) int ret; MSVCRT__lock_file(file); - ret = MSVCRT_fwrite(s, sizeof(*s), len, file) == len ? 0 : MSVCRT_EOF; + ret = MSVCRT__fwrite_nolock(s, sizeof(*s), len, file) == len ? 0 : MSVCRT_EOF; MSVCRT__unlock_file(file); return ret; } @@ -4468,14 +4468,14 @@ int CDECL MSVCRT_fputws(const MSVCRT_wchar_t *s, MSVCRT_FILE* file) MSVCRT__lock_file(file); if (!(get_ioinfo_nolock(file->_file)->wxflag & WX_TEXT)) { - ret = MSVCRT_fwrite(s,sizeof(*s),len,file) == len ? 0 : MSVCRT_EOF; + ret = MSVCRT__fwrite_nolock(s,sizeof(*s),len,file) == len ? 0 : MSVCRT_EOF; MSVCRT__unlock_file(file); return ret; } tmp_buf = add_std_buffer(file); for (i=0; i<len; i++) { - if(MSVCRT_fputwc(s[i], file) == MSVCRT_WEOF) { + if(MSVCRT__fputwc_nolock(s[i], file) == MSVCRT_WEOF) { if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return MSVCRT_WEOF; @@ -4512,8 +4512,8 @@ char * CDECL MSVCRT_gets(char *buf) char * buf_start = buf; MSVCRT__lock_file(MSVCRT_stdin); - for(cc = MSVCRT_fgetc(MSVCRT_stdin); cc != MSVCRT_EOF && cc != '\n'; - cc = MSVCRT_fgetc(MSVCRT_stdin)) + for(cc = MSVCRT__fgetc_nolock(MSVCRT_stdin); cc != MSVCRT_EOF && cc != '\n'; + cc = MSVCRT__fgetc_nolock(MSVCRT_stdin)) if(cc != '\r') *buf++ = (char)cc; *buf = '\0'; @@ -4532,8 +4532,8 @@ MSVCRT_wchar_t* CDECL MSVCRT__getws(MSVCRT_wchar_t* buf) MSVCRT_wchar_t* ws = buf; MSVCRT__lock_file(MSVCRT_stdin); - for (cc = MSVCRT_fgetwc(MSVCRT_stdin); cc != MSVCRT_WEOF && cc != '\n'; - cc = MSVCRT_fgetwc(MSVCRT_stdin)) + for (cc = MSVCRT__fgetwc_nolock(MSVCRT_stdin); cc != MSVCRT_WEOF && cc != '\n'; + cc = MSVCRT__fgetwc_nolock(MSVCRT_stdin)) { if (cc != '\r') *buf++ = (MSVCRT_wchar_t)cc; @@ -4578,12 +4578,12 @@ int CDECL MSVCRT_puts(const char *s) int ret; MSVCRT__lock_file(MSVCRT_stdout); - if(MSVCRT_fwrite(s, sizeof(*s), len, MSVCRT_stdout) != len) { + if(MSVCRT__fwrite_nolock(s, sizeof(*s), len, MSVCRT_stdout) != len) { MSVCRT__unlock_file(MSVCRT_stdout); return MSVCRT_EOF; } - ret = MSVCRT_fwrite("\n",1,1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; + ret = MSVCRT__fwrite_nolock("\n",1,1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; MSVCRT__unlock_file(MSVCRT_stdout); return ret; } @@ -4598,12 +4598,12 @@ int CDECL MSVCRT__putws(const MSVCRT_wchar_t *s) int ret; MSVCRT__lock_file(MSVCRT_stdout); - if(MSVCRT_fwrite(s, sizeof(*s), len, MSVCRT_stdout) != len) { + if(MSVCRT__fwrite_nolock(s, sizeof(*s), len, MSVCRT_stdout) != len) { MSVCRT__unlock_file(MSVCRT_stdout); return MSVCRT_EOF; } - ret = MSVCRT_fwrite(&nl,sizeof(nl),1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; + ret = MSVCRT__fwrite_nolock(&nl,sizeof(nl),1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; MSVCRT__unlock_file(MSVCRT_stdout); return ret; } @@ -4671,7 +4671,7 @@ int CDECL MSVCRT_setvbuf(MSVCRT_FILE* file, char *buf, int mode, MSVCRT_size_t s MSVCRT__lock_file(file); - MSVCRT_fflush(file); + MSVCRT__fflush_nolock(file); if(file->_flag & MSVCRT__IOMYBUF) MSVCRT_free(file->_base); file->_flag &= ~(MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF); @@ -4823,13 +4823,13 @@ static int puts_clbk_file_w(void *file, int len, const MSVCRT_wchar_t *str) MSVCRT__lock_file(file); if(!(get_ioinfo_nolock(((MSVCRT_FILE*)file)->_file)->wxflag & WX_TEXT)) { - ret = MSVCRT_fwrite(str, sizeof(MSVCRT_wchar_t), len, file); + ret = MSVCRT__fwrite_nolock(str, sizeof(MSVCRT_wchar_t), len, file); MSVCRT__unlock_file(file); return ret; } for(i=0; i<len; i++) { - if(MSVCRT_fputwc(str[i], file) == MSVCRT_WEOF) { + if(MSVCRT__fputwc_nolock(str[i], file) == MSVCRT_WEOF) { MSVCRT__unlock_file(file); return -1; }

1 0

Sebastian Lackner : ws2_32/tests: Fix several copy and paste errors.
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: d57ccd54f8d751b57490d5a74c3a81ac31297313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57ccd54f8d751b57490d5a74… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 29 09:55:39 2014 +0100 ws2_32/tests: Fix several copy and paste errors. --- dlls/ws2_32/tests/sock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 106588d..16f98c0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3358,14 +3358,14 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); ok(ret == 2, "select returned %d\n", ret); ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); - ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); ok(send(fdWrite, "test", 4, 0) == 4, "failed to send data\n"); FD_ZERO(&readfds); FD_SET(fdRead, &readfds); ret = select(fdRead+1, &readfds, NULL, NULL, &select_timeout); ok(ret == 1, "select returned %d\n", ret); - ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); FD_ZERO(&readfds); FD_SET(fdWrite, &readfds); @@ -3373,7 +3373,7 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); ok(ret == 2, "select returned %d\n", ret); ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); - ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); while(1) { FD_ZERO(&writefds); @@ -3388,7 +3388,7 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); ok(ret == 1, "select returned %d\n", ret); ok(!FD_ISSET(fdWrite, &readfds), "fdWrite socket is in the set\n"); - ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); ok(send(fdRead, "test", 4, 0) == 4, "failed to send data\n"); Sleep(100); @@ -3398,7 +3398,7 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); ok(ret == 2, "select returned %d\n", ret); ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); - ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); closesocket(fdRead); closesocket(fdWrite);

1 0

Austin English : ole2: Add a stub for WriteClassStg.
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: b017bdcab3aba20461fb870dec7fd8d672653c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b017bdcab3aba20461fb870de… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 28 15:03:40 2014 -0600 ole2: Add a stub for WriteClassStg. --- dlls/ole2.dll16/ole2.c | 9 +++++++++ dlls/ole2.dll16/ole2.dll16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index 25fb141..3a27132 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -346,3 +346,12 @@ VOID WINAPI ReleaseStgMedium16(LPSTGMEDIUM medium) { FIXME("%p: unimplemented stub!\n", medium); } + +/*********************************************************************** + * WriteClassStg16 (OLE2.19) + */ +HRESULT WINAPI WriteClassStg16(IStorage *stg, REFCLSID clsid) +{ + FIXME("stub:%p %s\n", stg, debugstr_guid(clsid)); + return STG_E_MEDIUMFULL; +} diff --git a/dlls/ole2.dll16/ole2.dll16.spec b/dlls/ole2.dll16/ole2.dll16.spec index 5c6e9c0..cb6b1ec 100644 --- a/dlls/ole2.dll16/ole2.dll16.spec +++ b/dlls/ole2.dll16/ole2.dll16.spec @@ -16,7 +16,7 @@ 16 stub OLEISRUNNING 17 stub OLELOCKRUNNING 18 pascal ReadClassStg(segptr ptr) ReadClassStg16 -19 stub WRITECLASSSTG +19 pascal WriteClassStg(segptr ptr) WriteClassStg16 20 stub READCLASSSTM 21 stub WRITECLASSSTM 22 stub BINDMONIKER

1 0

Austin English : ole2disp: Add a stub for VariantChangeTypeEx.
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 6fd25a458c919398ebc8ebddf716f5b848181475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd25a458c919398ebc8ebddf… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 28 14:58:26 2014 -0600 ole2disp: Add a stub for VariantChangeTypeEx. --- dlls/ole2disp.dll16/ole2disp.c | 9 +++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 61a4043..1850346 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -260,6 +260,15 @@ HRESULT WINAPI RegisterActiveObject16( } /****************************************************************************** + * VariantChangeTypeEx [OLE2DISP.108] + */ +HRESULT WINAPI VariantChangeTypeEx16(VARIANTARG *dest, const VARIANTARG *src, LCID lcid, USHORT flags, VARTYPE vt) +{ + FIXME("stub: %p %p %d %d %d\n", dest, src, lcid, flags, vt); + return E_INVALIDARG; +} + +/****************************************************************************** * SetErrorInfo [OLE2DISP.110] */ HRESULT WINAPI SetErrorInfo16(ULONG dwReserved, IErrorInfo *perrinfo) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index c027d12..2cf6784 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -9,7 +9,7 @@ 9 stub VARIANTCLEAR 10 stub VARIANTCOPY 11 stub VARIANTCOPYIND -12 pascal VARIANTCHANGETYPE(ptr ptr long long) VariantChangeType16 +12 pascal VariantChangeType(ptr ptr word word) VariantChangeType16 13 stub VARIANTTIMETODOSDATETIME 14 stub DOSDATETIMETOVARIANTTIME 15 stub SAFEARRAYCREATE @@ -105,7 +105,7 @@ 105 stub VARBOOLFROMSTR 106 stub VARBOOLFROMDISP 107 stub DOINVOKEMETHOD -108 stub VARIANTCHANGETYPEEX +108 pascal VariantChangeTypeEx(ptr ptr long word word) VariantChangeTypeEx16 109 stub SAFEARRAYPTROFINDEX 110 pascal SetErrorInfo(long ptr) SetErrorInfo16 111 stub GETERRORINFO

1 0

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 December 2014