July 2006 - Wine-commits - list.winehq.org

Stefan Siebert : comdlg32: GetOpenFileNameW - Create unicode windows.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: bb310d5486855004f2dba0b39c8c5e80c7cb711f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bb310d5486855004f2dba0b… Author: Stefan Siebert <stefan.siebert(a)web.de> Date: Mon Jul 24 14:45:32 2006 +0200 comdlg32: GetOpenFileNameW - Create unicode windows. --- dlls/comdlg32/filedlg.c | 47 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 37ce6c2..6a780f1 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -261,7 +261,7 @@ static BOOL WINAPI GetFileName95(FileOpe /* Create the dialog from a template */ - if(!(hRes = FindResourceA(COMDLG32_hInstance,MAKEINTRESOURCEA(NEWFILEOPENORD),(LPSTR)RT_DIALOG))) + if(!(hRes = FindResourceW(COMDLG32_hInstance,MAKEINTRESOURCEW(NEWFILEOPENORD),(LPCWSTR)RT_DIALOG))) { COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); return FALSE; @@ -285,11 +285,18 @@ static BOOL WINAPI GetFileName95(FileOpe /* Some shell namespace extensions depend on COM being initialized. */ hr = OleInitialize(NULL); - lRes = DialogBoxIndirectParamA(COMDLG32_hInstance, - (LPDLGTEMPLATEA) template, - fodInfos->ofnInfos->hwndOwner, - FileOpenDlgProc95, - (LPARAM) fodInfos); + if (fodInfos->unicode) + lRes = DialogBoxIndirectParamW(COMDLG32_hInstance, + template, + fodInfos->ofnInfos->hwndOwner, + FileOpenDlgProc95, + (LPARAM) fodInfos); + else + lRes = DialogBoxIndirectParamA(COMDLG32_hInstance, + (LPDLGTEMPLATEA) template, + fodInfos->ofnInfos->hwndOwner, + FileOpenDlgProc95, + (LPARAM) fodInfos); if (SUCCEEDED(hr)) OleUninitialize(); @@ -771,9 +778,14 @@ static HWND CreateTemplateDialog(FileOpe return NULL; } } - hChildDlg = CreateDialogIndirectParamA(hinst, template, hwnd, - IsHooked(fodInfos) ? (DLGPROC)fodInfos->ofnInfos->lpfnHook : FileOpenDlgProcUserTemplate, - (LPARAM)fodInfos->ofnInfos); + if (fodInfos->unicode) + hChildDlg = CreateDialogIndirectParamW(hinst, template, hwnd, + IsHooked(fodInfos) ? (DLGPROC)fodInfos->ofnInfos->lpfnHook : FileOpenDlgProcUserTemplate, + (LPARAM)fodInfos->ofnInfos); + else + hChildDlg = CreateDialogIndirectParamA(hinst, template, hwnd, + IsHooked(fodInfos) ? (DLGPROC)fodInfos->ofnInfos->lpfnHook : FileOpenDlgProcUserTemplate, + (LPARAM)fodInfos->ofnInfos); if(hChildDlg) { ShowWindow(hChildDlg,SW_SHOW); @@ -1197,11 +1209,18 @@ static LRESULT FILEDLG95_InitControls(HW rectTB.left = rectlook.right; rectTB.top = rectlook.top-1; - fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL, - WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE, - rectTB.left, rectTB.top, - rectTB.right - rectTB.left, rectTB.bottom - rectTB.top, - hwnd, (HMENU)IDC_TOOLBAR, COMDLG32_hInstance, NULL); + if (fodInfos->unicode) + fodInfos->DlgInfos.hwndTB = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, + WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE, + rectTB.left, rectTB.top, + rectTB.right - rectTB.left, rectTB.bottom - rectTB.top, + hwnd, (HMENU)IDC_TOOLBAR, COMDLG32_hInstance, NULL); + else + fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL, + WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE, + rectTB.left, rectTB.top, + rectTB.right - rectTB.left, rectTB.bottom - rectTB.top, + hwnd, (HMENU)IDC_TOOLBAR, COMDLG32_hInstance, NULL); SendMessageA(fodInfos->DlgInfos.hwndTB, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0);

1 0

Robert Shearman : configure: Add a check for the DGifOpen function in the gif_lib. h header as the v4 of the file does define it, while v3 doesn't.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: 68249c10df19541dc2ea62b4b3654426184763dd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=68249c10df19541dc2ea62b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jul 25 10:36:06 2006 +0100 configure: Add a check for the DGifOpen function in the gif_lib.h header as the v4 of the file does define it, while v3 doesn't. --- configure | 67 ++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 8 +++++ dlls/oleaut32/olepicture.c | 6 ++-- include/config.h.in | 3 ++ 4 files changed, 81 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 5463ff9..0e61520 100755 --- a/configure +++ b/configure @@ -14947,6 +14947,73 @@ fi fi +if test "$ac_cv_header_gif_lib_h" = "yes" +then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <gif_lib.h> +int +main () +{ +static typeof(DGifOpen) * func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GIF 1 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + + EXTRACFLAGS="" if test "x${GCC}" = "xyes" diff --git a/configure.ac b/configure.ac index 426389d..70185a8 100644 --- a/configure.ac +++ b/configure.ac @@ -880,6 +880,14 @@ then AC_CHECK_LIB(capi20,capi20_register,[AC_DEFINE(HAVE_CAPI4LINUX,1,[Define if you have capi4linux libs and headers])]) fi +dnl **** Check for gif header usability **** + +if test "$ac_cv_header_gif_lib_h" = "yes" +then + AC_TRY_COMPILE([#include <gif_lib.h>],[static typeof(DGifOpen) * func;], + AC_DEFINE(HAVE_GIF, 1, [Define if you have usable GIF headers])) +fi + dnl **** Check for gcc specific options **** AC_SUBST(EXTRACFLAGS,"") diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 2349b31..a72919e 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -993,7 +993,7 @@ static boolean _jpeg_resync_to_restart(j static void _jpeg_term_source(j_decompress_ptr cinfo) { } #endif /* HAVE_JPEGLIB_H */ -#ifdef HAVE_GIF_LIB_H +#ifdef HAVE_GIF static void *libungif_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -1040,12 +1040,12 @@ static int _gif_inputfunc(GifFileType *g return len; } -#endif /* HAVE_GIF_LIB_H */ +#endif /* HAVE_GIF */ static HRESULT OLEPictureImpl_LoadGif(OLEPictureImpl *This, BYTE *xbuf, ULONG xread) { -#ifdef HAVE_GIF_LIB_H +#ifdef HAVE_GIF struct gifdata gd; GifFileType *gif; BITMAPINFO *bmi; diff --git a/include/config.h.in b/include/config.h.in index 48c047d..50b64ef 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -212,6 +212,9 @@ #undef HAVE_GETTIMEOFDAY /* Define to 1 if you have the `getuid' function. */ #undef HAVE_GETUID +/* Define if you have usable GIF headers */ +#undef HAVE_GIF + /* Define to 1 if you have the <gif_lib.h> header file. */ #undef HAVE_GIF_LIB_H

1 0

Robert Shearman : dbghelp: Implement SymGetSymFromAddr64.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: 5c8b22f385b8b87116294cf6f8cdabc5c779d01a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c8b22f385b8b87116294cf… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jul 25 10:35:49 2006 +0100 dbghelp: Implement SymGetSymFromAddr64. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index ca688ee..8457a35 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -99,7 +99,7 @@ @ stub SymGetSourceVarFromToken @ stub SymGetSourceVarFromTokenW @ stdcall SymGetSymFromAddr(long long ptr ptr) -@ stub SymGetSymFromAddr64 +@ stdcall SymGetSymFromAddr64(long long long ptr ptr) @ stdcall SymGetSymFromName(long str ptr) @ stub SymGetSymFromName64 @ stdcall SymGetSymNext(long ptr) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 2d1e4ed..d93bdd2 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1046,6 +1046,34 @@ BOOL WINAPI SymGetSymFromAddr(HANDLE hPr return TRUE; } +/****************************************************************** + * SymGetSymFromAddr64 (DBGHELP.@) + * + */ +BOOL WINAPI SymGetSymFromAddr64(HANDLE hProcess, DWORD64 Address, + PDWORD64 Displacement, PIMAGEHLP_SYMBOL64 Symbol) +{ + char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME]; + SYMBOL_INFO*si = (SYMBOL_INFO*)buffer; + size_t len; + DWORD64 Displacement64; + + if (Symbol->SizeOfStruct < sizeof(*Symbol)) return FALSE; + si->SizeOfStruct = sizeof(*si); + si->MaxNameLen = MAX_SYM_NAME; + if (!SymFromAddr(hProcess, Address, &Displacement64, si)) + return FALSE; + + if (Displacement) + *Displacement = Displacement64; + Symbol->Address = si->Address; + Symbol->Size = si->Size; + Symbol->Flags = si->Flags; + len = min(Symbol->MaxNameLength, si->MaxNameLen); + lstrcpynA(Symbol->Name, si->Name, len); + return TRUE; +} + static BOOL find_name(struct process* pcs, struct module* module, const char* name, SYMBOL_INFO* symbol) {

1 0

Mike McCormack : msi: Always load all the components.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: 1d46cdf11af912f4ec1b4f390fc1844605be2ce5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d46cdf11af912f4ec1b4f3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jul 25 21:49:44 2006 +0900 msi: Always load all the components. --- dlls/msi/action.c | 141 ++++++++++++++++++++++------------------------ dlls/msi/tests/install.c | 5 -- dlls/msi/tests/package.c | 2 - 3 files changed, 68 insertions(+), 80 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2479f2e..f7454c2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1095,13 +1095,16 @@ static UINT ACTION_CreateFolders(MSIPACK return rc; } -static MSICOMPONENT* load_component( MSIRECORD * row ) +static UINT load_component( MSIRECORD *row, LPVOID param ) { + MSIPACKAGE *package = param; MSICOMPONENT *comp; comp = msi_alloc_zero( sizeof(MSICOMPONENT) ); if (!comp) - return comp; + return ERROR_FUNCTION_FAILED; + + list_add_tail( &package->components, &comp->entry ); /* fill in the data */ comp->Component = msi_dup_record_field( row, 1 ); @@ -1118,26 +1121,41 @@ static MSICOMPONENT* load_component( MSI switch (comp->Attributes) { - case msidbComponentAttributesLocalOnly: - comp->Action = INSTALLSTATE_LOCAL; - comp->ActionRequest = INSTALLSTATE_LOCAL; - break; - case msidbComponentAttributesSourceOnly: - comp->Action = INSTALLSTATE_SOURCE; - comp->ActionRequest = INSTALLSTATE_SOURCE; - break; - case msidbComponentAttributesOptional: - comp->Action = INSTALLSTATE_LOCAL; - comp->ActionRequest = INSTALLSTATE_LOCAL; - break; - default: - comp->Action = INSTALLSTATE_UNKNOWN; - comp->ActionRequest = INSTALLSTATE_UNKNOWN; + case msidbComponentAttributesLocalOnly: + case msidbComponentAttributesOptional: + comp->Action = INSTALLSTATE_LOCAL; + comp->ActionRequest = INSTALLSTATE_LOCAL; + break; + case msidbComponentAttributesSourceOnly: + comp->Action = INSTALLSTATE_SOURCE; + comp->ActionRequest = INSTALLSTATE_SOURCE; + break; + default: + comp->Action = INSTALLSTATE_UNKNOWN; + comp->ActionRequest = INSTALLSTATE_UNKNOWN; } - comp->Enabled = TRUE; + return ERROR_SUCCESS; +} + +static UINT load_all_components( MSIPACKAGE *package ) +{ + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R', 'O','M',' ', + '`','C','o','m','p','o','n','e','n','t','`',0 }; + MSIQUERY *view; + UINT r; + + if (!list_empty(&package->components)) + return ERROR_SUCCESS; - return comp; + r = MSI_DatabaseOpenViewW( package->db, query, &view ); + if (r != ERROR_SUCCESS) + return r; + + r = MSI_IterateRecords(view, NULL, load_component, package); + msiobj_release(&view->hdr); + return r; } typedef struct { @@ -1158,56 +1176,24 @@ static UINT add_feature_component( MSIFE return ERROR_SUCCESS; } -static UINT iterate_component_check( MSIRECORD *row, LPVOID param ) -{ - _ilfs* ilfs= (_ilfs*)param; - MSIPACKAGE *package = ilfs->package; - MSIFEATURE *feature = ilfs->feature; - MSICOMPONENT *comp; - - comp = load_component( row ); - if (!comp) - return ERROR_FUNCTION_FAILED; - - list_add_tail( &package->components, &comp->entry ); - add_feature_component( feature, comp ); - - TRACE("Loaded new component %p\n", comp); - - return ERROR_SUCCESS; -} - static UINT iterate_load_featurecomponents(MSIRECORD *row, LPVOID param) { _ilfs* ilfs= (_ilfs*)param; LPCWSTR component; - DWORD rc; MSICOMPONENT *comp; - MSIQUERY * view; - static const WCHAR Query[] = - {'S','E','L','E','C','T',' ','*',' ','F','R', 'O','M',' ', - '`','C','o','m','p','o','n','e','n','t','`',' ', - 'W','H','E','R','E',' ', - '`','C','o','m','p','o','n','e','n','t','`',' ', - '=','\'','%','s','\'',0}; component = MSI_RecordGetString(row,1); /* check to see if the component is already loaded */ comp = get_loaded_component( ilfs->package, component ); - if (comp) + if (!comp) { - TRACE("Component %s already loaded\n", debugstr_w(component) ); - add_feature_component( ilfs->feature, comp ); - return ERROR_SUCCESS; + ERR("unknown component %s\n", debugstr_w(component)); + return ERROR_FUNCTION_FAILED; } - rc = MSI_OpenQuery(ilfs->package->db, &view, Query, component); - if (rc != ERROR_SUCCESS) - return ERROR_SUCCESS; - - rc = MSI_IterateRecords(view, NULL, iterate_component_check, ilfs); - msiobj_release( &view->hdr ); + add_feature_component( ilfs->feature, comp ); + comp->Enabled = TRUE; return ERROR_SUCCESS; } @@ -1271,6 +1257,27 @@ static UINT load_feature(MSIRECORD * row return ERROR_SUCCESS; } +static UINT load_all_features( MSIPACKAGE *package ) +{ + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ', 'F','R','O','M',' ', + '`','F','e','a','t','u','r','e','`',' ','O','R','D','E','R', + ' ','B','Y',' ','`','D','i','s','p','l','a','y','`',0}; + MSIQUERY *view; + UINT r; + + if (!list_empty(&package->features)) + return ERROR_SUCCESS; + + r = MSI_DatabaseOpenViewW( package->db, query, &view ); + if (r != ERROR_SUCCESS) + return r; + + r = MSI_IterateRecords( view, NULL, load_feature, package ); + msiobj_release( &view->hdr ); + return r; +} + static LPWSTR folder_split_path(LPWSTR p, WCHAR ch) { if (!p) @@ -1361,12 +1368,6 @@ static UINT load_all_files(MSIPACKAGE *p */ static UINT ACTION_CostInitialize(MSIPACKAGE *package) { - MSIQUERY * view; - UINT rc; - static const WCHAR Query_all[] = - {'S','E','L','E','C','T',' ','*',' ', 'F','R','O','M',' ', - '`','F','e','a','t','u','r','e','`',' ','O','R','D','E','R', - ' ','B','Y',' ','`','D','i','s','p','l','a','y','`',0}; static const WCHAR szCosting[] = {'C','o','s','t','i','n','g','C','o','m','p','l','e','t','e',0 }; static const WCHAR szZero[] = { '0', 0 }; @@ -1375,19 +1376,11 @@ static UINT ACTION_CostInitialize(MSIPAC return ERROR_SUCCESS; MSI_SetPropertyW(package, szCosting, szZero); - MSI_SetPropertyW(package, cszRootDrive , c_colon); - - rc = MSI_DatabaseOpenViewW(package->db,Query_all,&view); - if (rc != ERROR_SUCCESS) - return rc; - - if (list_empty(&package->features)) - { - rc = MSI_IterateRecords(view, NULL, load_feature, package); - msiobj_release(&view->hdr); - } + MSI_SetPropertyW(package, cszRootDrive, c_colon); - load_all_files(package); + load_all_components( package ); + load_all_features( package ); + load_all_files( package ); return ERROR_SUCCESS; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index dfd469b..8792629 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -661,10 +661,7 @@ static void test_MsiSetComponentState(vo ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); r = MsiDoAction(package, "CostInitialize"); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); r = MsiDoAction(package, "FileCost"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index d44d981..f375260 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -315,10 +315,8 @@ static void test_getsourcepath( void ) r = MsiGetSourcePath( hpkg, "TARGETDIR", buffer, &sz ); ok( r == ERROR_DIRECTORY, "return value wrong\n"); - todo_wine { r = MsiDoAction( hpkg, "CostInitialize"); ok( r == ERROR_SUCCESS, "cost init failed\n"); - } r = MsiDoAction( hpkg, "CostFinalize"); ok( r == ERROR_SUCCESS, "cost finalize failed\n");

1 0

Alexandre Julliard : uninstaller: Fail more gracefully when the registry key is missing.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: 084458bc2e292fa44952f760ab8214bb2f182bd9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=084458bc2e292fa44952f76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 25 17:50:27 2006 +0200 uninstaller: Fail more gracefully when the registry key is missing. --- programs/uninstaller/main.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 79cc30b..df97b93 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -76,8 +76,7 @@ static void ListUninstallPrograms(void) char *descr; char *key; - if (! FetchUninstallInformation()) - return; + FetchUninstallInformation(); for (i=0; i < numentries; i++) { @@ -100,8 +99,7 @@ static void RemoveSpecificProgram(WCHAR int lenName; char *name; - if (! FetchUninstallInformation()) - return; + FetchUninstallInformation(); for (i=0; i < numentries; i++) { @@ -196,10 +194,7 @@ static int FetchUninstallInformation(voi numentries = 0; oldsel = -1; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, PathUninstallW, 0, KEY_READ, &hkeyUninst) != ERROR_SUCCESS) - { - MessageBoxW(0, sRegistryKeyNotAvailable, sAppName, MB_OK); return 0; - } if (!entries) entries = HeapAlloc(GetProcessHeap(), 0, sizeof(uninst_entry)); @@ -363,6 +358,7 @@ static void UpdateList(HWND hList) prevsel = SendMessageW(hList, LB_GETCURSEL, 0, 0); if (!(FetchUninstallInformation())) { + MessageBoxW(0, sRegistryKeyNotAvailable, sAppName, MB_OK); PostQuitMessage(0); return; }

1 0

Neil Skrypuch : oleaut32: Adding a NULL to a safearray is supposed to crash .
by Alexandre Julliard 25 Jul '06

25 Jul '06

Module: wine Branch: refs/heads/master Commit: 8cec3cf120b8159313426acd81753b5a0a4d9ae9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8cec3cf120b8159313426ac… Author: Neil Skrypuch <ns03ja(a)brocku.ca> Date: Sun Jul 23 12:25:52 2006 -0400 oleaut32: Adding a NULL to a safearray is supposed to crash. --- dlls/oleaut32/safearray.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 0eb92da..d3dd5e1 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -843,12 +843,6 @@ HRESULT WINAPI SafeArrayPutElement(SAFEA if (!psa || !rgIndices) return E_INVALIDARG; - if (!pvData) - { - ERR("Invalid pvData would crash under Win32!\n"); - return E_INVALIDARG; - } - hRet = SafeArrayLock(psa); if (SUCCEEDED(hRet))

1 0

Alexandre Julliard : server: Try harder to find a suitable thread for read/ write_process_memory.
by Alexandre Julliard 25 Jul '06

25 Jul '06

Module: wine Branch: refs/heads/master Commit: 7b767fb71c64315cf67f6ddd708051708f7a6637 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b767fb71c64315cf67f6dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 25 11:41:47 2006 +0200 server: Try harder to find a suitable thread for read/write_process_memory. --- server/ptrace.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index c3d7249..ed35d2e 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -298,18 +298,27 @@ static int write_thread_int( struct thre return res; } +/* return a thread of the process suitable for ptracing */ +static struct thread *get_ptrace_thread( struct process *process ) +{ + struct thread *thread; + + LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) + { + if (thread->unix_pid != -1) return thread; + } + set_error( STATUS_ACCESS_DENIED ); /* process is dead */ + return NULL; +} + /* read data from a process memory space */ int read_process_memory( struct process *process, const void *ptr, size_t size, char *dest ) { - struct thread *thread = get_process_first_thread( process ); + struct thread *thread = get_ptrace_thread( process ); unsigned int first_offset, last_offset, len; int data, *addr; - if (!thread) /* process is dead */ - { - set_error( STATUS_ACCESS_DENIED ); - return 0; - } + if (!thread) return 0; first_offset = (unsigned long)ptr % sizeof(int); last_offset = (size + first_offset) % sizeof(int); @@ -366,17 +375,13 @@ static int check_process_write_access( s /* write data to a process memory space */ int write_process_memory( struct process *process, void *ptr, size_t size, const char *src ) { - struct thread *thread = get_process_first_thread( process ); + struct thread *thread = get_ptrace_thread( process ); int ret = 0, data = 0; size_t len; int *addr; unsigned int first_mask, first_offset, last_mask, last_offset; - if (!thread) /* process is dead */ - { - set_error( STATUS_ACCESS_DENIED ); - return 0; - } + if (!thread) return 0; /* compute the mask for the first int */ first_mask = ~0;

1 0

Alexandre Julliard : ntdll: Avoid accessing the TEB after the memory view has been released.
by Alexandre Julliard 25 Jul '06

25 Jul '06

Module: wine Branch: refs/heads/master Commit: b91a6298a73526215b8de1cb2b1f28b7d7e7681b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b91a6298a73526215b8de1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 25 12:03:56 2006 +0200 ntdll: Avoid accessing the TEB after the memory view has been released. When using reserved areas the memory could potentially be reused right after the release. --- dlls/ntdll/server.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index a64bdb6..d6d18e0 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -141,6 +141,7 @@ void server_exit_thread( int status ) { struct wine_pthread_thread_info info; SIZE_T size; + int fds[4]; RtlAcquirePebLock(); RemoveEntryList( &NtCurrentTeb()->TlsLinks ); @@ -151,6 +152,11 @@ void server_exit_thread( int status ) info.teb_sel = wine_get_fs(); info.exit_status = status; + fds[0] = ntdll_get_thread_data()->wait_fd[0]; + fds[1] = ntdll_get_thread_data()->wait_fd[1]; + fds[2] = ntdll_get_thread_data()->reply_fd; + fds[3] = ntdll_get_thread_data()->request_fd; + size = 0; NtFreeVirtualMemory( GetCurrentProcess(), &info.stack_base, &size, MEM_RELEASE | MEM_SYSTEM ); info.stack_size = size; @@ -160,10 +166,10 @@ void server_exit_thread( int status ) info.teb_size = size; pthread_functions.sigprocmask( SIG_BLOCK, &block_set, NULL ); - close( ntdll_get_thread_data()->wait_fd[0] ); - close( ntdll_get_thread_data()->wait_fd[1] ); - close( ntdll_get_thread_data()->reply_fd ); - close( ntdll_get_thread_data()->request_fd ); + close( fds[0] ); + close( fds[1] ); + close( fds[2] ); + close( fds[3] ); pthread_functions.exit_thread( &info ); }

1 0

Mike McCormack : msi: Fix where queries on 32bit integer columns.
by Alexandre Julliard 25 Jul '06

25 Jul '06

Module: wine Branch: refs/heads/master Commit: 4ab109e507bcf29450da18f5935962e340ebf089 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4ab109e507bcf29450da18f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jul 25 11:17:56 2006 +0900 msi: Fix where queries on 32bit integer columns. --- dlls/msi/query.h | 1 + dlls/msi/tests/db.c | 7 ++----- dlls/msi/where.c | 26 ++++++++++++++++++-------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/msi/query.h b/dlls/msi/query.h index ea32c69..03ebbdd 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -53,6 +53,7 @@ #define EXPR_UVAL 6 #define EXPR_STRCMP 7 #define EXPR_WILDCARD 9 #define EXPR_COL_NUMBER_STRING 10 +#define EXPR_COL_NUMBER32 11 struct sql_str { LPCWSTR data; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 5d03ca4..c268125 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1029,11 +1029,8 @@ static void test_where(void) query = "SELECT * FROM `Media` WHERE `LastSequence` >= 1"; r = do_query(hdb, query, &rec); - todo_wine - { - ok(r == ERROR_SUCCESS, "MsiViewFetch failed: %d\n", r); - ok( check_record( rec, 4, "one.cab"), "wrong cabinet\n"); - } + ok(r == ERROR_SUCCESS, "MsiViewFetch failed: %d\n", r); + ok( check_record( rec, 4, "one.cab"), "wrong cabinet\n"); MsiCloseHandle( hdb ); DeleteFile(msifile); diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 8fbedce..7670bfd 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -99,7 +99,7 @@ static UINT WHERE_set_int( struct tagMSI return wv->table->ops->set_int( wv->table, row, col, val ); } -static UINT INT_evaluate( UINT lval, UINT op, UINT rval ) +static INT INT_evaluate( INT lval, UINT op, INT rval ) { switch( op ) { @@ -156,7 +156,7 @@ static const WCHAR *STRING_evaluate( str } static UINT STRCMP_Evaluate( string_table *st, MSIVIEW *table, UINT row, - struct expr *cond, UINT *val, MSIRECORD *record ) + struct expr *cond, INT *val, MSIRECORD *record ) { int sr; const WCHAR *l_str, *r_str; @@ -180,18 +180,25 @@ static UINT STRCMP_Evaluate( string_tabl } static UINT WHERE_evaluate( MSIDATABASE *db, MSIVIEW *table, UINT row, - struct expr *cond, UINT *val, MSIRECORD *record ) + struct expr *cond, INT *val, MSIRECORD *record ) { - UINT r, lval, rval; + UINT r, tval; + INT lval, rval; if( !cond ) return ERROR_SUCCESS; switch( cond->type ) { - case EXPR_COL_NUMBER_STRING: case EXPR_COL_NUMBER: - return table->ops->fetch_int( table, row, cond->u.col_number, val ); + r = table->ops->fetch_int( table, row, cond->u.col_number, &tval ); + *val = tval - 0x8000; + return ERROR_SUCCESS; + + case EXPR_COL_NUMBER32: + r = table->ops->fetch_int( table, row, cond->u.col_number, &tval ); + *val = tval; + return r; case EXPR_UVAL: *val = cond->u.uval; @@ -226,7 +233,8 @@ static UINT WHERE_evaluate( MSIDATABASE static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; - UINT count = 0, r, val, i; + UINT count = 0, r, i; + INT val; MSIVIEW *table = wv->table; TRACE("%p %p\n", wv, record); @@ -440,6 +448,8 @@ static UINT WHERE_VerifyCondition( MSIDA { if (type&MSITYPE_STRING) cond->type = EXPR_COL_NUMBER_STRING; + else if ((type&0xff) == 4) + cond->type = EXPR_COL_NUMBER32; else cond->type = EXPR_COL_NUMBER; cond->u.col_number = val; @@ -490,7 +500,7 @@ static UINT WHERE_VerifyCondition( MSIDA case EXPR_IVAL: *valid = 1; cond->type = EXPR_UVAL; - cond->u.uval = cond->u.ival + (1<<15); + cond->u.uval = cond->u.ival; break; case EXPR_WILDCARD: *valid = 1;

1 0

Jason Green : wined3d: Implement more GLSL instructions.
by Alexandre Julliard 25 Jul '06

25 Jul '06

Module: wine Branch: refs/heads/master Commit: 7e90aba97be15e746839bda89f71bbd146af8c19 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7e90aba97be15e746839bda… Author: Jason Green <jave27(a)gmail.com> Date: Mon Jul 24 22:52:38 2006 -0400 wined3d: Implement more GLSL instructions. Implement D3DSIO_TEXREG2AR, TEXREG2GB, TEXREG2RGB, TEXM3X3TEX, TEXM3X3SPEC. --- dlls/wined3d/glsl_shader.c | 134 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/pixelshader.c | 10 +-- dlls/wined3d/wined3d_private.h | 5 + 3 files changed, 144 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=7e90aba97be15e74683…

1 0