December 2014 - Wine-Commits

André Hentschel : localspl: Remove unused strings ( Clang).
by Alexandre Julliard Dec. 2, 2014

Dec. 2, 2014

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

Stefan Dösinger : wined3d: Add a comment about reset during focus change.
by Alexandre Julliard Dec. 2, 2014

Dec. 2, 2014

Module: wine Branch: master Commit: f103247ddf2debba343cce4594fcaaad58917eac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f103247ddf2debba343cce459… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 1 22:46:48 2014 +0100 wined3d: Add a comment about reset during focus change. --- dlls/wined3d/swapchain.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 362f0ae..89f83ea 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1176,6 +1176,11 @@ void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) { + /* This code is not protected by the wined3d mutex, so it may run while + * wined3d_device_reset is active. Testing on Windows shows that changing + * focus during resets and resetting during focus change events causes + * the application to crash with an invalid memory access. */ + if (activate) { if (!(swapchain->device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES))

1 0

André Hentschel : mshtml/tests: Remove unused variable (Clang).
by Alexandre Julliard Dec. 2, 2014

Dec. 2, 2014

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 Dec. 2, 2014

Dec. 2, 2014

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

Henri Verbeet : wined3d: Assign the name to the correct signature in pixelshader_init().
by Alexandre Julliard Dec. 1, 2014

Dec. 1, 2014

Module: wine Branch: master Commit: 55eb6c692264de661ace1d2ef66b8ba9a0990bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=55eb6c692264de661ace1d2ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 1 08:45:41 2014 +0100 wined3d: Assign the name to the correct signature in pixelshader_init(). --- dlls/wined3d/shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f32d248..796a924 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2346,7 +2346,7 @@ static HRESULT pixelshader_init(struct wined3d_shader *shader, struct wined3d_de len = strlen(e->semantic_name); memcpy(ptr, e->semantic_name, len + 1); - shader->output_signature[e->register_idx].semantic_name = ptr; + shader->input_signature[e->register_idx].semantic_name = ptr; ptr += len + 1; } }

1 0

Marcus Meissner : server: Initialize the _len parts to 0 (Coverity).
by Alexandre Julliard Dec. 1, 2014

Dec. 1, 2014

Module: wine Branch: master Commit: ea5808dff5a36f5950ad9da4b177b8ba86d0506e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea5808dff5a36f5950ad9da4b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 30 13:50:04 2014 +0100 server: Initialize the _len parts to 0 (Coverity). --- server/object.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/object.c b/server/object.c index ec196c1..d4afefd 100644 --- a/server/object.c +++ b/server/object.c @@ -451,6 +451,7 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri owner = token_get_user( token ); new_sd.owner_len = security_sid_len( owner ); } + else new_sd.owner_len = 0; if (set_info & GROUP_SECURITY_INFORMATION && sd->group_len) { @@ -467,6 +468,7 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri group = token_get_primary_group( token ); new_sd.group_len = security_sid_len( group ); } + else new_sd.group_len = 0; new_sd.control |= SE_SACL_PRESENT; sacl = sd_get_sacl( sd, &present ); @@ -479,9 +481,7 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri if (obj->sd && present) new_sd.sacl_len = obj->sd->sacl_len; else - { new_sd.sacl_len = 0; - } } new_sd.control |= SE_DACL_PRESENT; @@ -499,6 +499,7 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri dacl = token_get_default_dacl( token ); new_sd.dacl_len = dacl->AclSize; } + else new_sd.dacl_len = 0; } ptr = mem_alloc( sizeof(new_sd) + new_sd.owner_len + new_sd.group_len +

1 0

Marcus Meissner : dwrite: Remove unused hresult assignment (Coverity).
by Alexandre Julliard Dec. 1, 2014

Dec. 1, 2014

Module: wine Branch: master Commit: c7e9ffa70aa66af92c7cc0ceccd6faca9c049f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7e9ffa70aa66af92c7cc0cec… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 30 10:45:45 2014 +0100 dwrite: Remove unused hresult assignment (Coverity). --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 26afb92..5e82b81 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1586,7 +1586,7 @@ HRESULT create_font_collection(IDWriteFactory* factory, IDWriteFontFileEnumerato exists = FALSE; hr = collection_find_family(collection, buffer, &index, &exists); if (exists) - hr = fontfamily_add_font(collection->family_data[index], font_data); + fontfamily_add_font(collection->family_data[index], font_data); else { struct dwrite_fontfamily_data *family_data;

1 0

Gerald Pfeifer : wordpad: Check for array index before using it in registry_set_filelist.
by Alexandre Julliard Dec. 1, 2014

Dec. 1, 2014

Module: wine Branch: master Commit: 1994140f3da38c30a9c19b7423e3d5e9d8840d4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1994140f3da38c30a9c19b742… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Nov 29 12:59:26 2014 +0100 wordpad: Check for array index before using it in registry_set_filelist. --- programs/wordpad/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index 472ed4d..5b570e7 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -293,7 +293,7 @@ void registry_set_filelist(LPCWSTR newFile, HWND hMainWnd) if(lstrcmpiW(newFile, pFiles[0])) { - for(i = 0; pFiles[i] && i < FILELIST_ENTRIES; i++) + for(i = 0; i < FILELIST_ENTRIES && pFiles[i]; i++) { if(!lstrcmpiW(pFiles[i], newFile)) {

1 0

Marcus Meissner : dwrite: Initialize a variable (Coverity).
by Alexandre Julliard Dec. 1, 2014

Dec. 1, 2014

Module: wine Branch: master Commit: 2bfb3ef624c0dc0e67a5b6b27e392cc3b97d4c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bfb3ef624c0dc0e67a5b6b27… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 30 10:45:16 2014 +0100 dwrite: Initialize a variable (Coverity). --- dlls/dwrite/analyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 3670e46..17e0351 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -845,7 +845,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, { const struct dwritescript_properties *scriptprops; struct scriptshaping_context context; - struct scriptshaping_cache *cache; + struct scriptshaping_cache *cache = NULL; WCHAR *string; BOOL update_cluster; UINT32 i, g;

1 0

Austin English : ole2: Add a stub for WriteClassStg.
by Alexandre Julliard Dec. 1, 2014

Dec. 1, 2014

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