April 2012 - Wine-commits - list.winehq.org

Alexandre Julliard : gdi32: Fix some typos in the 4-bpp shrink_row function .
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 6c2235cf98bcd187dd5ee4608d9edc3cabb224bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c2235cf98bcd187dd5ee4608… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 23 14:58:12 2012 +0200 gdi32: Fix some typos in the 4-bpp shrink_row function. --- dlls/gdi32/dibdrv/primitives.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 55c17b7..21381ec 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -5319,8 +5319,8 @@ static void shrink_row_4(const dib_info *dst_dib, const POINT *dst_start, const struct stretch_params *params, int mode, BOOL keep_dst) { - BYTE *dst_ptr = get_pixel_ptr_8( dst_dib, dst_start->x, dst_start->y ); - BYTE *src_ptr = get_pixel_ptr_8( src_dib, src_start->x, src_start->y ); + BYTE *dst_ptr = get_pixel_ptr_4( dst_dib, dst_start->x, dst_start->y ); + BYTE *src_ptr = get_pixel_ptr_4( src_dib, src_start->x, src_start->y ); int err = params->err_start; int width, dst_x = dst_start->x, src_x = src_start->x; struct rop_codes codes; @@ -5330,12 +5330,12 @@ static void shrink_row_4(const dib_info *dst_dib, const POINT *dst_start, rop_codes_from_stretch_mode( mode, &codes ); for (width = params->length; width; width--) { - if (new_pix && !keep_dst) do_rop_mask_8( dst_ptr, 0, init_val, (dst_x & 1) ? 0xf0 : 0x0f ); + if (new_pix && !keep_dst) do_rop_mask_8( dst_ptr, 0, init_val, (dst_x & 1) ? 0x0f : 0xf0 ); if (src_x & 1) src_val = (*src_ptr & 0x0f) | (*src_ptr << 4); else src_val = (*src_ptr & 0xf0) | (*src_ptr >> 4); - do_rop_codes_mask_8( dst_ptr, src_val, &codes, (dst_x & 1) ? 0xf0 : 0x0f ); + do_rop_codes_mask_8( dst_ptr, src_val, &codes, (dst_x & 1) ? 0x0f : 0xf0 ); new_pix = FALSE; if ((src_x & ~1) != ((src_x + params->src_inc) & ~1))

1 0

Jacek Caban : mshtml: Accept different VARIANT types in document_write.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: f6980025b984b0a179dd01ef532ca2c4ea275ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6980025b984b0a179dd01ef5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 23 12:48:58 2012 +0200 mshtml: Accept different VARIANT types in document_write. --- dlls/mshtml/htmldoc.c | 35 +++++++++++++++++++++++------------ dlls/mshtml/tests/dom.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 98bdcab..71f0db9 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -799,8 +799,8 @@ static HRESULT WINAPI HTMLDocument_get_nameProp(IHTMLDocument2 *iface, BSTR *p) static HRESULT document_write(HTMLDocument *This, SAFEARRAY *psarray, BOOL ln) { + VARIANT *var, tmp; nsAString nsstr; - VARIANT *var; ULONG i, argc; nsresult nsres; HRESULT hres; @@ -824,27 +824,38 @@ static HRESULT document_write(HTMLDocument *This, SAFEARRAY *psarray, BOOL ln) return hres; } - nsAString_Init(&nsstr, NULL); + V_VT(&tmp) = VT_EMPTY; argc = psarray->rgsabound[0].cElements; for(i=0; i < argc; i++) { if(V_VT(var+i) == VT_BSTR) { - nsAString_SetData(&nsstr, V_BSTR(var+i)); - if(!ln || i != argc-1) - nsres = nsIDOMHTMLDocument_Write(This->doc_node->nsdoc, &nsstr, NULL /* FIXME! */); - else - nsres = nsIDOMHTMLDocument_Writeln(This->doc_node->nsdoc, &nsstr, NULL /* FIXME! */); - if(NS_FAILED(nsres)) - ERR("Write failed: %08x\n", nsres); + nsAString_InitDepend(&nsstr, V_BSTR(var+i)); }else { - FIXME("unsupported arg[%d] = %s\n", i, debugstr_variant(var+i)); + hres = VariantChangeType(&tmp, var+i, 0, VT_BSTR); + if(FAILED(hres)) { + WARN("Could not convert %s to string\n", debugstr_variant(var+i)); + break; + } + nsAString_InitDepend(&nsstr, V_BSTR(&tmp)); + } + + if(!ln || i != argc-1) + nsres = nsIDOMHTMLDocument_Write(This->doc_node->nsdoc, &nsstr, NULL /* FIXME! */); + else + nsres = nsIDOMHTMLDocument_Writeln(This->doc_node->nsdoc, &nsstr, NULL /* FIXME! */); + nsAString_Finish(&nsstr); + if(V_VT(var+i) != VT_BSTR) + VariantClear(&tmp); + if(NS_FAILED(nsres)) { + ERR("Write failed: %08x\n", nsres); + hres = E_FAIL; + break; } } - nsAString_Finish(&nsstr); SafeArrayUnaccessData(psarray); - return S_OK; + return hres; } static HRESULT WINAPI HTMLDocument_write(IHTMLDocument2 *iface, SAFEARRAY *psarray) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4176394..fcc2654 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4783,6 +4783,34 @@ static void doc_write(IHTMLDocument2 *doc, BOOL ln, const char *text) SafeArrayDestroy(sa); } +static void doc_complex_write(IHTMLDocument2 *doc) +{ + SAFEARRAYBOUND dim = {5, 0}; + SAFEARRAY *sa; + VARIANT *args; + HRESULT hres; + + sa = SafeArrayCreate(VT_VARIANT, 1, &dim); + SafeArrayAccessData(sa, (void**)&args); + + V_VT(args) = VT_BSTR; + V_BSTR(args) = a2bstr("<body i4val=\""); + V_VT(args+1) = VT_I4; + V_I4(args+1) = 4; + V_VT(args+2) = VT_BSTR; + V_BSTR(args+2) = a2bstr("\" r8val=\""); + V_VT(args+3) = VT_R8; + V_R8(args+3) = 3.14; + V_VT(args+4) = VT_BSTR; + V_BSTR(args+4) = a2bstr("\">"); + SafeArrayUnaccessData(sa); + + hres = IHTMLDocument2_write(doc, sa); + ok(hres == S_OK, "write failed: %08x\n", hres); + + SafeArrayDestroy(sa); +} + static void test_frame_doc(IUnknown *frame_elem, BOOL iframe) { IHTMLDocument2 *window_doc, *elem_doc; @@ -4823,6 +4851,7 @@ static void test_iframe_elem(IHTMLElement *elem) IHTMLDocument2 *content_doc, *owner_doc; IHTMLElementCollection *col; IHTMLWindow2 *content_window; + IHTMLElement *body; IDispatch *disp; VARIANT errv; BSTR str; @@ -4854,7 +4883,9 @@ static void test_iframe_elem(IHTMLElement *elem) ok(iface_cmp((IUnknown*)disp, (IUnknown*)content_window), "disp != content_window\n"); IDispatch_Release(disp); - doc_write(content_doc, FALSE, "<html><head><title>test</title></head><body><br /></body>"); + doc_write(content_doc, FALSE, "<html><head><title>test</title></head>"); + doc_complex_write(content_doc); + doc_write(content_doc, TRUE, "<br />"); doc_write(content_doc, TRUE, "</html>"); hres = IHTMLDocument2_get_all(content_doc, &col); @@ -4862,6 +4893,11 @@ static void test_iframe_elem(IHTMLElement *elem) test_elem_collection((IUnknown*)col, all_types, sizeof(all_types)/sizeof(all_types[0])); IHTMLElementCollection_Release(col); + body = doc_get_body(content_doc); + test_elem_attr(body, "i4val", "4"); + test_elem_attr(body, "r8val", "3.14"); + IHTMLElement_Release(body); + hres = IHTMLDocument2_close(content_doc); ok(hres == S_OK, "close failed: %08x\n", hres);

1 0

Jacek Caban : winhttp: Trace accept types in WinHttpOpenRequest.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: f69445adeb8ca9881982c151f328e4e8df48de45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69445adeb8ca9881982c151f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 23 14:50:15 2012 +0200 winhttp: Trace accept types in WinHttpOpenRequest. --- dlls/winhttp/session.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 2d899ab..1f5d825 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -917,6 +917,14 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o TRACE("%p, %s, %s, %s, %s, %p, 0x%08x\n", hconnect, debugstr_w(verb), debugstr_w(object), debugstr_w(version), debugstr_w(referrer), types, flags); + if(types && TRACE_ON(winhttp)) { + const WCHAR **iter; + + TRACE("accept types:\n"); + for(iter = types; *iter; iter++) + TRACE(" %s\n", debugstr_w(*iter)); + } + if (!(connect = (connect_t *)grab_object( hconnect ))) { set_last_error( ERROR_INVALID_HANDLE );

1 0

Hans Leidekker : msi: Reduce the indentation level in ACTION_GetComponentInstallStates.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: f1af03fa169d4fded80063ae43422cb5cc5b07a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1af03fa169d4fded80063ae4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 23 15:46:12 2012 +0200 msi: Reduce the indentation level in ACTION_GetComponentInstallStates. --- dlls/msi/action.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b3472f8..eb755be 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1620,16 +1620,19 @@ static void ACTION_GetComponentInstallStates(MSIPACKAGE *package) r = MsiQueryComponentStateW( package->ProductCode, NULL, MSIINSTALLCONTEXT_USERMANAGED, comp->ComponentId, &comp->Installed ); - if (r != ERROR_SUCCESS) - r = MsiQueryComponentStateW( package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERUNMANAGED, comp->ComponentId, - &comp->Installed ); - if (r != ERROR_SUCCESS) - r = MsiQueryComponentStateW( package->ProductCode, NULL, - MSIINSTALLCONTEXT_MACHINE, comp->ComponentId, - &comp->Installed ); - if (r != ERROR_SUCCESS) - comp->Installed = INSTALLSTATE_ABSENT; + if (r == ERROR_SUCCESS) continue; + + r = MsiQueryComponentStateW( package->ProductCode, NULL, + MSIINSTALLCONTEXT_USERUNMANAGED, comp->ComponentId, + &comp->Installed ); + if (r == ERROR_SUCCESS) continue; + + r = MsiQueryComponentStateW( package->ProductCode, NULL, + MSIINSTALLCONTEXT_MACHINE, comp->ComponentId, + &comp->Installed ); + if (r == ERROR_SUCCESS) continue; + + comp->Installed = INSTALLSTATE_ABSENT; } }

1 0

Hans Leidekker : msi: Initialize hkey in msi_comp_find_prod_key.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: cf1cb30dfae79d9fe2f772b52f242b432e8eca6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1cb30dfae79d9fe2f772b52… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 23 15:46:30 2012 +0200 msi: Initialize hkey in msi_comp_find_prod_key. --- dlls/msi/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 4783573..35ffe9e 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2112,7 +2112,7 @@ UINT WINAPI MsiQueryComponentStateA(LPCSTR szProductCode, static BOOL msi_comp_find_prod_key(LPCWSTR prodcode, MSIINSTALLCONTEXT context) { UINT r; - HKEY hkey; + HKEY hkey = NULL; r = MSIREG_OpenProductKey(prodcode, NULL, context, &hkey, FALSE); RegCloseKey(hkey);

1 0

Hans Leidekker : msi: Dynamically allocate the path buffer in MsiQueryComponentStateW.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 2e5bf9ca066c8c042ac0be5ef12497245b4a0c11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5bf9ca066c8c042ac0be5ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 23 15:46:41 2012 +0200 msi: Dynamically allocate the path buffer in MsiQueryComponentStateW. --- dlls/msi/msi.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 35ffe9e..baef974 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2148,7 +2148,7 @@ static BOOL msi_comp_find_package(LPCWSTR prodcode, MSIINSTALLCONTEXT context) return (res == ERROR_SUCCESS); } -static BOOL msi_comp_find_prodcode(LPWSTR squished_pc, +static UINT msi_comp_find_prodcode(LPWSTR squished_pc, MSIINSTALLCONTEXT context, LPCWSTR comp, LPWSTR val, DWORD *sz) { @@ -2162,14 +2162,14 @@ static BOOL msi_comp_find_prodcode(LPWSTR squished_pc, r = MSIREG_OpenUserDataComponentKey(comp, NULL, &hkey, FALSE); if (r != ERROR_SUCCESS) - return FALSE; + return r; res = RegQueryValueExW(hkey, squished_pc, NULL, NULL, (BYTE *)val, sz); if (res != ERROR_SUCCESS) - return FALSE; + return res; RegCloseKey(hkey); - return TRUE; + return res; } UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode, @@ -2177,7 +2177,6 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode, LPCWSTR szComponent, INSTALLSTATE *pdwState) { WCHAR squished_pc[GUID_SIZE]; - WCHAR val[MAX_PATH]; BOOL found; DWORD sz; @@ -2208,14 +2207,21 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode, *pdwState = INSTALLSTATE_UNKNOWN; - sz = MAX_PATH; - if (!msi_comp_find_prodcode(squished_pc, dwContext, szComponent, val, &sz)) + sz = 0; + if (msi_comp_find_prodcode(squished_pc, dwContext, szComponent, NULL, &sz)) return ERROR_UNKNOWN_COMPONENT; if (sz == 0) *pdwState = INSTALLSTATE_NOTUSED; else { + WCHAR *val; + UINT r; + + if (!(val = msi_alloc( sz ))) return ERROR_OUTOFMEMORY; + if ((r = msi_comp_find_prodcode(squished_pc, dwContext, szComponent, val, &sz))) + return r; + if (lstrlenW(val) > 2 && val[0] >= '0' && val[0] <= '9' && val[1] >= '0' && val[1] <= '9' && val[2] != ':') { @@ -2223,6 +2229,7 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode, } else *pdwState = INSTALLSTATE_LOCAL; + msi_free( val ); } TRACE("-> %d\n", *pdwState);

1 0

Hans Leidekker : msi: Remove child folders first in the RemoveFolders action.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 52f3d5beadf201e4293f09b90be5bef1f607faca URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f3d5beadf201e4293f09b90… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 23 15:46:50 2012 +0200 msi: Remove child folders first in the RemoveFolders action. --- dlls/msi/action.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index eb755be..aa2cfca 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -884,6 +884,20 @@ static UINT ACTION_CreateFolders(MSIPACKAGE *package) return rc; } +static void remove_persistent_folder( MSIFOLDER *folder ) +{ + FolderList *fl; + + LIST_FOR_EACH_ENTRY( fl, &folder->children, FolderList, entry ) + { + remove_persistent_folder( fl->folder ); + } + if (folder->persistent && folder->State != FOLDER_STATE_REMOVED) + { + if (RemoveDirectoryW( folder->ResolvedTarget )) folder->State = FOLDER_STATE_REMOVED; + } +} + static UINT ITERATE_RemoveFolders( MSIRECORD *row, LPVOID param ) { MSIPACKAGE *package = param; @@ -927,9 +941,8 @@ static UINT ITERATE_RemoveFolders( MSIRECORD *row, LPVOID param ) msi_ui_actiondata( package, szRemoveFolders, uirow ); msiobj_release( &uirow->hdr ); - RemoveDirectoryW( full_path ); folder = msi_get_loaded_folder( package, dir ); - folder->State = FOLDER_STATE_REMOVED; + remove_persistent_folder( folder ); return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: Check supported languages in the AppSearch action.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: c8bb33599046928b8710d04e16352fa55c56a8aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8bb33599046928b8710d04e1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 23 15:47:15 2012 +0200 msi: Check supported languages in the AppSearch action. --- dlls/msi/appsearch.c | 159 ++++++++++++++++++++++++++++++++------------------ dlls/msi/msi.c | 6 +-- dlls/msi/msipriv.h | 1 + 3 files changed, 104 insertions(+), 62 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 0010fd8..21daf43 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -608,6 +608,65 @@ static void ACTION_ExpandAnyPath(MSIPACKAGE *package, WCHAR *src, WCHAR *dst, msi_free(deformatted); } +static LANGID *parse_languages( const WCHAR *languages, DWORD *num_ids ) +{ + UINT i, count = 1; + WCHAR *str = strdupW( languages ), *p, *q; + LANGID *ret; + + if (!str) return NULL; + for (p = q = str; (q = strchrW( q, ',' )); q++) count++; + + if (!(ret = msi_alloc( count * sizeof(LANGID) ))) + { + msi_free( str ); + return NULL; + } + i = 0; + while (*p) + { + q = strchrW( p, ',' ); + if (q) *q = 0; + ret[i] = atoiW( p ); + if (!q) break; + p = q + 1; + i++; + } + msi_free( str ); + *num_ids = count; + return ret; +} + +static BOOL match_languages( const void *version, const WCHAR *languages ) +{ + struct lang + { + USHORT id; + USHORT codepage; + } *lang; + DWORD len, num_ids, i, j; + BOOL found = FALSE; + LANGID *ids; + + if (!languages || !languages[0]) return TRUE; + if (!VerQueryValueW( version, szLangResource, (void **)&lang, &len )) return FALSE; + if (!(ids = parse_languages( languages, &num_ids ))) return FALSE; + + for (i = 0; i < num_ids; i++) + { + found = FALSE; + for (j = 0; j < len / sizeof(struct lang); j++) + { + if (!ids[i] || ids[i] == lang[j].id) found = TRUE; + } + if (!found) goto done; + } + +done: + msi_free( ids ); + return found; +} + /* Sets *matches to whether the file (whose path is filePath) matches the * versions set in sig. * Return ERROR_SUCCESS in case of success (whether or not the file matches), @@ -616,69 +675,55 @@ static void ACTION_ExpandAnyPath(MSIPACKAGE *package, WCHAR *src, WCHAR *dst, static UINT ACTION_FileVersionMatches(const MSISIGNATURE *sig, LPCWSTR filePath, BOOL *matches) { - UINT rc = ERROR_SUCCESS; + UINT len; + void *version; + VS_FIXEDFILEINFO *info = NULL; + DWORD zero, size = GetFileVersionInfoSizeW( filePath, &zero ); *matches = FALSE; - if (sig->Languages) - { - FIXME(": need to check version for languages %s\n", - debugstr_w(sig->Languages)); - } - else - { - DWORD zero, size = GetFileVersionInfoSizeW(filePath, &zero); - if (size) - { - LPVOID buf = msi_alloc( size); + if (!size) return ERROR_SUCCESS; + if (!(version = msi_alloc( size ))) return ERROR_OUTOFMEMORY; - if (buf) - { - UINT versionLen; - LPVOID subBlock = NULL; - - if (GetFileVersionInfoW(filePath, 0, size, buf)) - VerQueryValueW(buf, szBackSlash, &subBlock, &versionLen); - if (subBlock) - { - VS_FIXEDFILEINFO *info = subBlock; - - TRACE("Comparing file version %d.%d.%d.%d:\n", - HIWORD(info->dwFileVersionMS), - LOWORD(info->dwFileVersionMS), - HIWORD(info->dwFileVersionLS), - LOWORD(info->dwFileVersionLS)); - if (info->dwFileVersionMS < sig->MinVersionMS - || (info->dwFileVersionMS == sig->MinVersionMS && - info->dwFileVersionLS < sig->MinVersionLS)) - { - TRACE("Less than minimum version %d.%d.%d.%d\n", - HIWORD(sig->MinVersionMS), - LOWORD(sig->MinVersionMS), - HIWORD(sig->MinVersionLS), - LOWORD(sig->MinVersionLS)); - } - else if ((sig->MaxVersionMS || sig->MaxVersionLS) && - (info->dwFileVersionMS > sig->MaxVersionMS || - (info->dwFileVersionMS == sig->MaxVersionMS && - info->dwFileVersionLS > sig->MaxVersionLS))) - { - TRACE("Greater than maximum version %d.%d.%d.%d\n", - HIWORD(sig->MaxVersionMS), - LOWORD(sig->MaxVersionMS), - HIWORD(sig->MaxVersionLS), - LOWORD(sig->MaxVersionLS)); - } - else - *matches = TRUE; - } - msi_free( buf); - } - else - rc = ERROR_OUTOFMEMORY; + if (GetFileVersionInfoW( filePath, 0, size, version )) + VerQueryValueW( version, szBackSlash, (void **)&info, &len ); + + if (info) + { + TRACE("comparing file version %d.%d.%d.%d:\n", + HIWORD(info->dwFileVersionMS), + LOWORD(info->dwFileVersionMS), + HIWORD(info->dwFileVersionLS), + LOWORD(info->dwFileVersionLS)); + if (info->dwFileVersionMS < sig->MinVersionMS + || (info->dwFileVersionMS == sig->MinVersionMS && + info->dwFileVersionLS < sig->MinVersionLS)) + { + TRACE("less than minimum version %d.%d.%d.%d\n", + HIWORD(sig->MinVersionMS), + LOWORD(sig->MinVersionMS), + HIWORD(sig->MinVersionLS), + LOWORD(sig->MinVersionLS)); + } + else if ((sig->MaxVersionMS || sig->MaxVersionLS) && + (info->dwFileVersionMS > sig->MaxVersionMS || + (info->dwFileVersionMS == sig->MaxVersionMS && + info->dwFileVersionLS > sig->MaxVersionLS))) + { + TRACE("greater than maximum version %d.%d.%d.%d\n", + HIWORD(sig->MaxVersionMS), + LOWORD(sig->MaxVersionMS), + HIWORD(sig->MaxVersionLS), + LOWORD(sig->MaxVersionLS)); + } + else if (!match_languages( version, sig->Languages )) + { + TRACE("languages %s not supported\n", debugstr_w( sig->Languages )); } + else *matches = TRUE; } - return rc; + msi_free( version ); + return ERROR_SUCCESS; } /* Sets *matches to whether the file in findData matches that in sig. diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index baef974..973bebd 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3133,11 +3133,7 @@ static UINT get_file_version( const WCHAR *path, WCHAR *verbuf, DWORD *verlen, WCHAR *langbuf, DWORD *langlen ) { static const WCHAR szVersionResource[] = {'\\',0}; - static const WCHAR szVersionFormat[] = { - '%','d','.','%','d','.','%','d','.','%','d',0}; - static const WCHAR szLangResource[] = { - '\\','V','a','r','F','i','l','e','I','n','f','o','\\', - 'T','r','a','n','s','l','a','t','i','o','n',0}; + static const WCHAR szVersionFormat[] = {'%','d','.','%','d','.','%','d','.','%','d',0}; static const WCHAR szLangFormat[] = {'%','d',0}; UINT ret = ERROR_SUCCESS; DWORD len, error; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index dc748e2..bdce06b 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1172,6 +1172,7 @@ static const WCHAR szAppDataFolder[] = {'A','p','p','D','a','t','a','F','o','l', static const WCHAR szRollbackDisabled[] = {'R','o','l','l','b','a','c','k','D','i','s','a','b','l','e','d',0}; static const WCHAR szName[] = {'N','a','m','e',0}; static const WCHAR szData[] = {'D','a','t','a',0}; +static const WCHAR szLangResource[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1);

1 0

Dmitry Timoshkov : gdiplus: Avoid saving negative values in pixel_size and emSize.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 9b5b04c1c1a7b32dd3e1e453b6d739082c4ccede URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b5b04c1c1a7b32dd3e1e453b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 19 21:43:51 2012 +0900 gdiplus: Avoid saving negative values in pixel_size and emSize. --- dlls/gdiplus/font.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 169e28f..1ac7604 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -190,9 +190,6 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, (*font)->lfw.lfUnderline = logfont->lfUnderline; (*font)->lfw.lfStrikeOut = logfont->lfStrikeOut; - (*font)->pixel_size = (*font)->emSize = logfont->lfHeight; - (*font)->unit = UnitPixel; - hfont = CreateFontIndirectW(&(*font)->lfw); oldfont = SelectObject(hdc, hfont); GetTextMetricsW(hdc, &textmet); @@ -201,6 +198,8 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, (*font)->lfw.lfWeight = textmet.tmWeight; (*font)->lfw.lfCharSet = textmet.tmCharSet; + (*font)->pixel_size = (*font)->emSize = textmet.tmHeight; + (*font)->unit = UnitPixel; (*font)->height = 1; /* FIXME: need NEWTEXTMETRIC.ntmSizeEM here */ (*font)->line_spacing = textmet.tmAscent + textmet.tmDescent + textmet.tmExternalLeading;

1 0

Dmitry Timoshkov : gdiplus: Use symbolic names of font styles.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 44ec1a2e527f9b82178ad58a01858418a1db7e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44ec1a2e527f9b82178ad58a0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 20 16:43:24 2012 +0900 gdiplus: Use symbolic names of font styles. --- dlls/gdiplus/font.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 1ac7604..df3d407 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -148,7 +148,7 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, lfw->lfHeight = (*font)->pixel_size * -1; - lfw->lfWeight = style & FontStyleBold ? 700 : 400; + lfw->lfWeight = style & FontStyleBold ? FW_BOLD : FW_REGULAR; lfw->lfItalic = style & FontStyleItalic; lfw->lfUnderline = style & FontStyleUnderline; lfw->lfStrikeOut = style & FontStyleStrikeout; @@ -340,10 +340,10 @@ GpStatus WINGDIPAPI GdipGetFontStyle(GpFont *font, INT *style) if (!(font && style)) return InvalidParameter; - if (font->lfw.lfWeight > 400) + if (font->lfw.lfWeight > FW_REGULAR) *style = FontStyleBold; else - *style = 0; + *style = FontStyleRegular; if (font->lfw.lfItalic) *style |= FontStyleItalic; if (font->lfw.lfUnderline)

1 0