December 2005 - Wine-Commits

Alexandre Julliard : server: Fixed console access rights handling.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: b4fa1b914c70d621343254d289579ab8b8e53ede URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4fa1b914c70d621343254d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 13:54:34 2005 +0100 server: Fixed console access rights handling. --- server/console.c | 58 ++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 37 insertions(+), 21 deletions(-)

1 0

Raphael Junqueira : opengl: Fix last wgl regression.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 2d708edc5f715c2957790b3f926cf308f679de59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d708edc5f715c2957790b3… Author: Raphael Junqueira <fenix(a)club-internet.fr> Date: Thu Dec 22 13:54:01 2005 +0100 opengl: Fix last wgl regression. Fix wgl regression: test glx server version and extensions to use (and not use glXQueryDrawable on older glx implementations). --- dlls/opengl32/wgl.c | 147 ++++++++++++++++++++++++++++++++++++----------- dlls/opengl32/wgl_ext.c | 13 +++- dlls/opengl32/wgl_ext.h | 13 ++++ 3 files changed, 133 insertions(+), 40 deletions(-)

1 0

James Hawkins : shell32: Add tests for SHFileOperation's FO_MOVE command.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 036d5eff7bf6d2146d036066336aff842d15c988 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=036d5eff7bf6d2146d03606… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 22 11:19:13 2005 +0100 shell32: Add tests for SHFileOperation's FO_MOVE command. --- dlls/shell32/tests/shlfileop.c | 81 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index e73a513..60418ed 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -738,6 +738,7 @@ static void test_move(void) SHFILEOPSTRUCTA shfo, shfo2; CHAR from[MAX_PATH]; CHAR to[MAX_PATH]; + DWORD retval; shfo.hwnd = NULL; shfo.wFunc = FO_MOVE; @@ -750,7 +751,8 @@ static void test_move(void) set_curr_dir_path(from, "test1.txt\0"); set_curr_dir_path(to, "test4.txt\0"); ok(!SHFileOperationA(&shfo), "Prepare test to check how directories are moved recursively\n"); - ok(file_exists("test4.txt\\test1.txt"), "The file is moved\n"); + ok(!file_exists("test1.txt"), "test1.txt should not exist\n"); + ok(file_exists("test4.txt\\test1.txt"), "The file is not moved\n"); set_curr_dir_path(from, "test?.txt\0"); set_curr_dir_path(to, "testdir2\0"); @@ -815,6 +817,83 @@ static void test_move(void) set_curr_dir_path(from, "test6.txt\0"); set_curr_dir_path(to, "test4.txt\0"); ok(!SHFileOperationA(&shfo), "Move dir back\n"); + + /* move one file to two others */ + init_shfo_tests(); + shfo.pFrom = "test1.txt\0"; + shfo.pTo = "a.txt\0b.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", retval); + ok(!file_exists("test1.txt"), "Expected test1.txt to not exist\n"); + ok(DeleteFile("a.txt"), "Expected a.txt to exist\n"); + } + ok(!file_exists("b.txt"), "Expected b.txt to not exist\n"); + + /* move two files to one other */ + shfo.pFrom = "test2.txt\0test3.txt\0"; + shfo.pTo = "test1.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); + ok(!file_exists("test1.txt"), "Expected test1.txt to not exist\n"); + } + ok(file_exists("test2.txt"), "Expected test2.txt to exist\n"); + ok(file_exists("test3.txt"), "Expected test3.txt to exist\n"); + + /* move a directory into itself */ + shfo.pFrom = "test4.txt\0"; + shfo.pTo = "test4.txt\\b.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", retval); + } + ok(!RemoveDirectory("test4.txt\\b.txt"), "Expected test4.txt\\b.txt to not exist\n"); + ok(file_exists("test4.txt"), "Expected test4.txt to exist\n"); + + /* move many files without FOF_MULTIDESTFILES */ + shfo.pFrom = "test2.txt\0test3.txt\0"; + shfo.pTo = "d.txt\0e.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); + } + ok(!DeleteFile("d.txt"), "Expected d.txt to not exist\n"); + ok(!DeleteFile("e.txt"), "Expected e.txt to not exist\n"); + + /* number of sources != number of targets */ + shfo.pTo = "d.txt\0"; + shfo.fFlags |= FOF_MULTIDESTFILES; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); + } + ok(!DeleteFile("d.txt"), "Expected d.txt to not exist\n"); + + /* FO_MOVE does not create dest directories */ + shfo.pFrom = "test2.txt\0"; + shfo.pTo = "dir1\\dir2\\test2.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); + } + ok(!file_exists("dir1"), "Expected dir1 to exist\n"); + + /* try to overwrite an existing file */ + shfo.pTo = "test3.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", retval); + ok(!file_exists("test2.txt"), "Expected test2.txt to not exist\n"); + } + ok(file_exists("test3.txt"), "Expected test3.txt to exist\n"); } static void test_sh_create_dir(void)

1 0

James Hawkins : shell32: Add tests for SHFileOperation's FO_COPY command.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: d49181f99a1b4a2a0c719928b418c1c096811911 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d49181f99a1b4a2a0c71992… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 22 11:17:19 2005 +0100 shell32: Add tests for SHFileOperation's FO_COPY command. --- dlls/shell32/tests/shlfileop.c | 280 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 272 insertions(+), 8 deletions(-)

1 0

James Hawkins : shell32: Add tests for SHFileOperation's FO_RENAME command.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: edf423ab8693f0c8883ef9bef1329e2de7465984 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=edf423ab8693f0c8883ef9b… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 22 11:16:57 2005 +0100 shell32: Add tests for SHFileOperation's FO_RENAME command. --- dlls/shell32/tests/shlfileop.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 1a6edd5..7a0c22a 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -323,6 +323,40 @@ static void test_rename(void) set_curr_dir_path(to, "test4.txt\0"); retval = SHFileOperationA(&shfo); ok(!retval, "Rename dir back failed, retval = %ld\n", retval); + + /* try to rename more than one file to a single file */ + shfo.pFrom = "test1.txt\0test2.txt\0"; + shfo.pTo = "a.txt\0"; + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_GEN_FAILURE, "Expected ERROR_GEN_FAILURE, got %ld\n", retval); + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + ok(file_exists("test2.txt"), "Expected test2.txt to exist\n"); + + /* pFrom is valid, but pTo is empty */ + shfo.pFrom = "test1.txt\0"; + shfo.pTo = "\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); + } + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + + /* pFrom is empty */ + shfo.pFrom = "\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %ld\n", retval); + } + + /* pFrom is NULL */ + shfo.pFrom = NULL; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", retval); + } } /* tests the FO_COPY action */

1 0

James Hawkins : shell32: Add tests for SHFileOperation's FO_DELETE command.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: d3c3bc1d3a29d7e8aacfcf04c07331fc83b7dff7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d3c3bc1d3a29d7e8aacfcf0… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 22 11:15:42 2005 +0100 shell32: Add tests for SHFileOperation's FO_DELETE command. --- dlls/shell32/tests/shlfileop.c | 83 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index a850c3b..1a6edd5 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -171,6 +171,89 @@ static void test_delete(void) ok(!file_exists("test4.txt"), "Directory should be removed\n"); } ok(file_exists("test2.txt"), "This file should not be removed\n"); + + /* FOF_FILESONLY does not delete a dir matching a wildcard */ + init_shfo_tests(); + shfo.fFlags |= FOF_FILESONLY; + shfo.pFrom = "*.txt\0"; + todo_wine + { + ok(!SHFileOperation(&shfo), "Failed to delete files\n"); + ok(!file_exists("test1.txt"), "test1.txt should be removed\n"); + } + ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); + ok(file_exists("test4.txt"), "test4.txt should not be removed\n"); + + /* FOF_FILESONLY only deletes a dir if explicitly specified */ + init_shfo_tests(); + shfo.pFrom = "test_?.txt\0test4.txt\0"; + todo_wine + { + ok(!SHFileOperation(&shfo), "Failed to delete files\n"); + ok(!file_exists("test4.txt"), "test4.txt should be removed\n"); + } + ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); + ok(file_exists("test1.txt"), "test1.txt should not be removed\n"); + + /* try to delete an invalid filename */ + init_shfo_tests(); + shfo.pFrom = "\0"; + shfo.fFlags &= ~FOF_FILESONLY; + shfo.fAnyOperationsAborted = FALSE; + ret = SHFileOperation(&shfo); + todo_wine + { + ok(ret == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %ld\n", ret); + } + ok(!shfo.fAnyOperationsAborted, "Expected no aborted operations\n"); + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + + /* try an invalid function */ + init_shfo_tests(); + shfo.pFrom = "test1.txt\0"; + shfo.wFunc = 0; + ret = SHFileOperation(&shfo); + todo_wine + { + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", ret); + } + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + + /* try an invalid list, only one null terminator */ + init_shfo_tests(); + shfo.pFrom = ""; + shfo.wFunc = FO_DELETE; + ret = SHFileOperation(&shfo); + todo_wine + { + ok(ret == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %ld\n", ret); + } + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + + /* delete a dir, and then a file inside the dir, same as + * deleting a nonexistent file + */ + init_shfo_tests(); + shfo.pFrom = "testdir2\0testdir2\\one.txt\0"; + ret = SHFileOperation(&shfo); + todo_wine + { + ok(ret == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %ld\n", ret); + ok(!file_exists("testdir2"), "Expected testdir2 to not exist\n"); + } + ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); + + /* try the FOF_NORECURSION flag, continues deleting subdirs */ + init_shfo_tests(); + shfo.pFrom = "testdir2\0"; + shfo.fFlags |= FOF_NORECURSION; + ret = SHFileOperation(&shfo); + todo_wine + { + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", ret); + } + ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); + ok(!file_exists("testdir2\\nested"), "Expected testdir2\\nested to exist\n"); } /* tests the FO_RENAME action */

1 0

Robert Reif : winecfg: Add unmanaged windows configuration.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: e998da5e0738266e03fb5e4623611f3cf738665c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e998da5e0738266e03fb5e4… Author: Robert Reif <reif(a)earthlink.net> Date: Thu Dec 22 11:15:32 2005 +0100 winecfg: Add unmanaged windows configuration. --- programs/winecfg/En.rc | 26 +++++++++++++++----------- programs/winecfg/x11drvdlg.c | 18 ++++++++++++++++++ 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 3f37bf8..887aa81 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -65,28 +65,31 @@ BEGIN LTEXT "Screen color depth: ",IDC_STATIC,8,10,70,30 COMBOBOX IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX " Window settings ",IDC_STATIC,8,25,244,110 + GROUPBOX " Window settings ",IDC_STATIC,8,25,244,180 CONTROL "Allow DirectX apps to stop the mouse leaving their window",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 CONTROL "Enable desktop double buffering",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 + LTEXT "If windows are managed by your window manager, then they will have the standard borders, they will respect your virtual desktop and appear in your window list. \n\nIf the windows are unmanaged, they will be disconnected from your window manager. This will mean the windows do not integrate as closely with your desktop, but the emulation will be more accurate so it can help some programs to work better.", + IDC_STATIC,15,58,228,80 + CONTROL "Allow the window manager to control the windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,132,230,8 /* FIXME: the wording of this explanation could be a lot better */ LTEXT "You can choose to emulate a windows desktop, where all the windows are confined to one 'virtual screen', or you can have the windows placed on your standard desktop.", - IDC_STATIC,15,73,228,28 - LTEXT "Desktop size:",IDC_DESKTOP_SIZE,15,115,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,115,8,8,WS_DISABLED + IDC_STATIC,15,146,228,28 + LTEXT "Desktop size:",IDC_DESKTOP_SIZE,15,188,44,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,108,188,8,8,WS_DISABLED CONTROL "Emulate a virtual desktop",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 + BS_AUTOCHECKBOX | WS_TABSTOP,15,173,230,10 - EDITTEXT IDC_DESKTOP_WIDTH,64,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,64,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,140,244,120 + GROUPBOX " Direct3D ",IDC_STATIC,8,210,244,50 - LTEXT "Vertex Shader Support: ",IDC_STATIC,15,150,80,30 - COMBOBOX IDC_D3D_VSHADER_MODE,100,148,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Vertex Shader Support: ",IDC_STATIC,15,220,80,30 + COMBOBOX IDC_D3D_VSHADER_MODE,100,218,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Allow Pixel Shader (if supported by hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,165,230,10 + CONTROL "Allow Pixel Shader (if supported by hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,237,230,10 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -219,6 +222,7 @@ BEGIN CONTROL "Allow DirectX apps to stop the mouse leaving their window",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 CONTROL "Enable desktop double buffering",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 + CONTROL "Allow the window manager to manage created windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,55,230,8 GROUPBOX " Window settings ",IDC_STATIC,8,25,244,110 diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 4f93241..9348bbd 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -154,6 +154,13 @@ static void init_dialog(HWND dialog) } HeapFree(GetProcessHeap(), 0, buf); + buf = get_reg_key(config_key, keypath("X11 Driver"), "Managed", "Y"); + if (IS_OPTION_TRUE(*buf)) + CheckDlgButton(dialog, IDC_ENABLE_MANAGED, BST_CHECKED); + else + CheckDlgButton(dialog, IDC_ENABLE_MANAGED, BST_UNCHECKED); + HeapFree(GetProcessHeap(), 0, buf); + SendDlgItemMessage(dialog, IDC_D3D_VSHADER_MODE, CB_RESETCONTENT, 0, 0); for (it = 0; NULL != D3D_VS_Modes[it]; ++it) { SendDlgItemMessage(dialog, IDC_D3D_VSHADER_MODE, CB_ADDSTRING, 0, (LPARAM) D3D_VS_Modes[it]); @@ -221,6 +228,16 @@ static void on_enable_desktop_clicked(HW update_gui_for_desktop_mode(dialog); } +static void on_enable_managed_clicked(HWND dialog) { + WINE_TRACE("\n"); + + if (IsDlgButtonChecked(dialog, IDC_ENABLE_MANAGED) == BST_CHECKED) { + set_reg_key(config_key, keypath("X11 Driver"), "Managed", "Y"); + } else { + set_reg_key(config_key, keypath("X11 Driver"), "Managed", "N"); + } +} + static void on_screen_depth_changed(HWND dialog) { char *newvalue = get_text(dialog, IDC_SCREEN_DEPTH); char *spaceIndex = strchr(newvalue, ' '); @@ -290,6 +307,7 @@ GraphDlgProc(HWND hDlg, UINT uMsg, WPARA SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); switch(LOWORD(wParam)) { case IDC_ENABLE_DESKTOP: on_enable_desktop_clicked(hDlg); break; + case IDC_ENABLE_MANAGED: on_enable_managed_clicked(hDlg); break; case IDC_DX_MOUSE_GRAB: on_dx_mouse_grab_clicked(hDlg); break; case IDC_DOUBLE_BUFFER: on_double_buffer_clicked(hDlg); break; case IDC_D3D_PSHADER_MODE: on_d3d_pshader_mode_clicked(hDlg); break;

1 0

Eric Pouech : dbghelp: Correct handling for all module names.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 87ab6e6cd85901f8b87dec8a234ac45dbe27c00a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=87ab6e6cd85901f8b87dec8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Dec 22 11:11:39 2005 +0100 dbghelp: Correct handling for all module names. --- dlls/dbghelp/module.c | 44 +++++++++++++++++++++++++++----------------- 1 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c00cc74..2b0de8c 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -33,10 +33,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); -static void module_fill_module(const char* in, char* out, unsigned size) +static const char* ext[] = {".acm", ".dll", ".drv", ".exe", ".ocx", ".vxd", NULL}; + +static int match_ext(const char* ptr, size_t len) +{ + const char**e; + size_t l; + + for (e = ext; *e; e++) + { + l = strlen(*e); + if (l >= len) return FALSE; + if (strncasecmp(&ptr[len - l], *e, l)) continue; + return l; + } + return 0; +} + +static void module_fill_module(const char* in, char* out, size_t size) { - const char *ptr,*endptr; - unsigned len; + const char *ptr,*endptr; + size_t len, l; endptr = in + strlen(in); for (ptr = endptr - 1; @@ -46,24 +63,17 @@ static void module_fill_module(const cha len = min(endptr-ptr,size-1); memcpy(out, ptr, len); out[len] = '\0'; - if (len > 4 && - (!strcasecmp(&out[len - 4], ".dll") || !strcasecmp(&out[len - 4], ".exe"))) - out[len - 4] = '\0'; - else if (((len > 12 && out[len - 13] == '/') || len == 12) && + if (len > 4 && (l = match_ext(out, len))) + out[len - l] = '\0'; + else if (len > 12 && (!strcasecmp(out + len - 12, "wine-pthread") || !strcasecmp(out + len - 12, "wine-kthread"))) - lstrcpynA(out, "<wine-loader>",size); + lstrcpynA(out, "<wine-loader>", size); else { - if (len > 7 && - (!strcasecmp(&out[len - 7], ".dll.so") || !strcasecmp(&out[len - 7], ".exe.so"))) - strcpy(&out[len - 7], "<elf>"); - else if (len > 7 && - out[len - 7] == '.' && !strcasecmp(&out[len - 3], ".so")) - { - if (len + 3 < size) strcpy(&out[len - 3], "<elf>"); - else WARN("Buffer too short: %s\n", out); - } + if (len > 3 && !strcasecmp(&out[len - 3], ".so") && + (l = match_ext(out, len - 3))) + strcpy(&out[len - l - 3], "<elf>"); } while ((*out = tolower(*out))) out++; }

1 0

Bill Medland : msi: Prevent array underflow in MsiFormat when measuring with zero-length buffer.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: b56ed22277549dd7aa9a2b35951f9b2db7be870f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b56ed22277549dd7aa9a2b3… Author: Bill Medland <billmedland(a)mercuryspeed.com> Date: Wed Dec 21 21:19:47 2005 +0100 msi: Prevent array underflow in MsiFormat when measuring with zero-length buffer. --- dlls/msi/format.c | 8 +++++++- dlls/msi/tests/format.c | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index c280541..85f9028 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -639,10 +639,15 @@ UINT MSI_FormatRecordA( MSIPACKAGE* pack len = deformat_string_internal(package,rec,&deformated,strlenW(rec), record, NULL); + /* If len is zero then WideCharToMultiByte will return 0 indicating + * failure, but that will do just as well since we are ignoring + * possible errors. + */ lenA = WideCharToMultiByte(CP_ACP,0,deformated,len,NULL,0,NULL,NULL); if (buffer) { + /* Ditto above */ WideCharToMultiByte(CP_ACP,0,deformated,len,buffer,*size,NULL, NULL); if (*size>lenA) { @@ -652,7 +657,8 @@ UINT MSI_FormatRecordA( MSIPACKAGE* pack else { rc = ERROR_MORE_DATA; - buffer[(*size)-1] = 0; + if (*size) + buffer[(*size)-1] = 0; } } else diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 11cd455..59c6f11 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -109,7 +109,7 @@ static void test_formatrecord(void) char buffer[100]; MSIHANDLE hrec; UINT r; - DWORD sz=100; + DWORD sz; r = MsiFormatRecord(0, 0, NULL, NULL ); ok( r == ERROR_INVALID_HANDLE, "wrong error\n"); @@ -122,6 +122,11 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "format failed\n"); buffer[0] = 'x'; buffer[1] = 0; + sz=0; + r = MsiFormatRecord(0, hrec, buffer+1, &sz); + ok( r == ERROR_MORE_DATA && buffer[0] == 'x', "format failed measuring with buffer\n"); + ok( sz == 16, "size wrong\n"); + sz=100; r = MsiFormatRecord(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed with empty buffer\n"); ok( sz == 16, "size wrong\n");

1 0

James Hawkins : shell32: Remove the '.\' prefix from filenames, because it hides a
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: bad4a1dc5fc0d057153a64a23bb47174ec66c866 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bad4a1dc5fc0d057153a64a… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Dec 21 21:18:19 2005 +0100 shell32: Remove the '.\\' prefix from filenames, because it hides a bug in SHFileOperation. --- dlls/shell32/tests/shlfileop.c | 173 ++++++++++++++++++++-------------------- 1 files changed, 88 insertions(+), 85 deletions(-)

1 0