wine-commits February 2012

wine-commits@winehq.org

2 participants
442 discussions

Frédéric Delanoy : po: Fix some trailing ellipses errors in Russian translation.
by Alexandre Julliard 07 Feb '12

07 Feb '12

Module: wine Branch: master Commit: ed3c69091054505a199683d321940013cc7ba533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3c69091054505a199683d32… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 00:35:18 2012 +0100 po: Fix some trailing ellipses errors in Russian translation. --- po/ru.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ru.po b/po/ru.po index 4bc676f..61e20a3 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6751,7 +6751,7 @@ msgstr "&Настройки..." #: msvfw32.rc:40 msgid "&About" -msgstr "&Информация..." +msgstr "&Информация" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -10765,7 +10765,7 @@ msgstr "&Создать..." #: progman.rc:31 msgid "O&pen\tEnter" -msgstr "О&ткрыть...\tEnter" +msgstr "О&ткрыть\tEnter" #: progman.rc:32 winefile.rc:27 msgid "&Move...\tF7"

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in Japanese translation.
by Alexandre Julliard 07 Feb '12

07 Feb '12

Module: wine Branch: master Commit: 7accb957a3c444c119a38e898b5d1edc27229d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7accb957a3c444c119a38e898… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 00:35:13 2012 +0100 po: Fix some trailing ellipses errors in Japanese translation. --- po/ja.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index aa9157f..5e1a7be 100644 --- a/po/ja.po +++ b/po/ja.po @@ -2174,7 +2174,7 @@ msgstr "ファイル名(&F):" #: cryptui.rc:293 cryptui.rc:315 cryptui.rc:429 winecfg.rc:295 msgid "B&rowse..." -msgstr "参照(&R)" +msgstr "参照(&R)..." #: cryptui.rc:294 msgid "" @@ -3177,7 +3177,7 @@ msgstr "ウィンドウ(&W)" #: ieframe.rc:31 view.rc:30 winhlp32.rc:29 msgid "&Open..." -msgstr "開く(&O)" +msgstr "開く(&O)..." #: ieframe.rc:33 notepad.rc:30 wordpad.rc:31 msgid "Save &as..."

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in Italian translation.
by Alexandre Julliard 07 Feb '12

07 Feb '12

Module: wine Branch: master Commit: 6900853f91c1e1da66f69156a88e813e1c2da600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6900853f91c1e1da66f69156a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 00:35:12 2012 +0100 po: Fix some trailing ellipses errors in Italian translation. --- po/it.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/it.po b/po/it.po index 8256063..088d8d4 100644 --- a/po/it.po +++ b/po/it.po @@ -10828,7 +10828,7 @@ msgstr "&Copia...\tF8" #: progman.rc:35 msgid "&Properties\tAlt+Enter" -msgstr "Propri&età...\tAlt+Invio" +msgstr "Propri&età\tAlt+Invio" #: progman.rc:37 msgid "&Execute..." @@ -13326,7 +13326,7 @@ msgstr "Ri&nomina..." #: winefile.rc:31 msgid "Propert&ies\tAlt+Enter" -msgstr "Propri&età...\tAlt+Invio" +msgstr "Propri&età\tAlt+Invio" #: winefile.rc:33 msgid "&Run..."

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in Brazilian Portuguese translation.
by Alexandre Julliard 07 Feb '12

07 Feb '12

Module: wine Branch: master Commit: 78ce1bd0c3e6f022f324eb517e753578128209e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ce1bd0c3e6f022f324eb517… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 00:35:10 2012 +0100 po: Fix some trailing ellipses errors in Brazilian Portuguese translation. --- po/pt_BR.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index dfcf031..cdee8a5 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10818,7 +10818,7 @@ msgstr "&Copiar...\tF8" #: progman.rc:35 msgid "&Properties\tAlt+Enter" -msgstr "&Propriedades...\tAlt+Enter" +msgstr "&Propriedades\tAlt+Enter" #: progman.rc:37 msgid "&Execute..."

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 07 Feb '12

07 Feb '12

Module: wine Branch: master Commit: e050861907b43a692380be99856ec068146114bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e050861907b43a692380be998… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Feb 6 23:40:37 2012 +0100 po: Update French translation. --- po/fr.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index 7b72e31..11a37ae 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-01-26 22:30+0100\n" +"PO-Revision-Date: 2012-02-06 23:40+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -2966,7 +2966,7 @@ msgstr "Actions" #: dinput.rc:51 msgid "Mapping" -msgstr "Mapping" +msgstr "Configuration" #: dinput.rc:53 msgid "Show Assigned First" @@ -13124,11 +13124,11 @@ msgstr "Menu contextuel" #: wineconsole.rc:67 msgid "&Control" -msgstr "&Control" +msgstr "&Contrôle" #: wineconsole.rc:68 msgid "S&hift" -msgstr "S&hift" +msgstr "Ma&j" #: wineconsole.rc:69 msgid "Quick edit"

1 0

Aric Stewart : gdi32: Keep our internal generated system links separate and append them to any user defined system links .
by Alexandre Julliard 07 Feb '12

07 Feb '12

Module: wine Branch: master Commit: e7a79b5565803f4d38d5c54276579ea589e50246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a79b5565803f4d38d5c5427… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 7 07:18:34 2012 -0600 gdi32: Keep our internal generated system links separate and append them to any user defined system links. --- dlls/gdi32/freetype.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 97 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index afbc971..ce9556d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -532,6 +532,10 @@ static const WCHAR system_link[] = {'S','o','f','t','w','a','r','e','\\','M','i' 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','F','o','n','t','L','i','n','k','\\', 'S','y','s','t','e','m','L','i','n','k',0}; +static const WCHAR internal_system_link[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', + 'F','o','n','t','L','i','n','k','\\', + 'S','y','s','t','e','m','L','i','n','k',0}; + /**************************************** * Notes on .fon files * @@ -2007,6 +2011,97 @@ static BOOL init_system_links(void) RegCloseKey(hkey); } + if(RegOpenKeyW(HKEY_CURRENT_USER, internal_system_link, &hkey) == ERROR_SUCCESS) + { + RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &max_val, &max_data, NULL, NULL); + value = HeapAlloc(GetProcessHeap(), 0, (max_val + 1) * sizeof(WCHAR)); + data = HeapAlloc(GetProcessHeap(), 0, max_data); + val_len = max_val + 1; + data_len = max_data; + index = 0; + while(RegEnumValueW(hkey, index++, value, &val_len, NULL, &type, (LPBYTE)data, &data_len) == ERROR_SUCCESS) + { + BOOL existing = FALSE; + memset(&fs, 0, sizeof(fs)); + psub = get_font_subst(&font_subst_list, value, -1); + /* Don't store fonts that are only substitutes for other fonts */ + if(psub) + { + TRACE("%s: Internal SystemLink entry for substituted font, ignoring\n", debugstr_w(value)); + goto next_internal; + } + + LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) + { + if(!strcmpiW(font_link->font_name, value)) + { + existing = TRUE; + break; + } + } + + if (!existing) + { + font_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*font_link)); + font_link->font_name = strdupW(value); + list_init(&font_link->links); + } + + for(entry = data; (char*)entry < (char*)data + data_len && *entry != 0; entry = next) + { + WCHAR *face_name; + CHILD_FONT *child_font; + + TRACE("Internal entry %s: %s\n", debugstr_w(value), debugstr_w(entry)); + + next = entry + strlenW(entry) + 1; + + face_name = strchrW(entry, ','); + if(face_name) + { + *face_name++ = 0; + while(isspaceW(*face_name)) + face_name++; + + psub = get_font_subst(&font_subst_list, face_name, -1); + if(psub) + face_name = psub->to.name; + } + face = find_face_from_filename(entry, face_name); + if(!face) + { + TRACE("Unable to find file %s face name %s\n", debugstr_w(entry), debugstr_w(face_name)); + continue; + } + + child_font = HeapAlloc(GetProcessHeap(), 0, sizeof(*child_font)); + child_font->face = face; + child_font->font = NULL; + fs.fsCsb[0] |= face->fs.fsCsb[0]; + fs.fsCsb[1] |= face->fs.fsCsb[1]; + TRACE("Adding file %s index %ld\n", child_font->face->file, child_font->face->face_index); + list_add_tail(&font_link->links, &child_font->entry); + } + family = find_family_from_name(font_link->font_name); + if(family) + { + LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) + { + face->fs_links = fs; + } + } + if (!existing) + list_add_tail(&system_links, &font_link->entry); + next_internal: + val_len = max_val + 1; + data_len = max_data; + } + + HeapFree(GetProcessHeap(), 0, value); + HeapFree(GetProcessHeap(), 0, data); + RegCloseKey(hkey); + } + /* Explicitly add an entry for the system font, this links to Tahoma and any links that Tahoma has */ @@ -2798,9 +2893,6 @@ static void update_font_info(void) } if (!done) FIXME("there is no font defaults for codepages %u,%u\n", ansi_cp, oem_cp); - - /* Clear out system links */ - RegDeleteKeyW(HKEY_LOCAL_MACHINE, system_link); } static void populate_system_links(HKEY hkey, const WCHAR *name, const WCHAR *const *values) @@ -2885,7 +2977,7 @@ static void update_system_links(void) static const WCHAR MS_Shell_Dlg[] = {'M','S',' ','S','h','e','l','l',' ','D','l','g',0}; - if (!RegCreateKeyExW(HKEY_LOCAL_MACHINE, system_link, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, &disposition)) + if (!RegCreateKeyExW(HKEY_CURRENT_USER, internal_system_link, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, &disposition)) { if (disposition == REG_OPENED_EXISTING_KEY) { @@ -2924,7 +3016,7 @@ static void update_system_links(void) if (!done) WARN("there is no SystemLink default list for MS Shell Dlg %s\n", debugstr_w(psub->to.name)); } else - WARN("failed to create SystemLink key\n"); + WARN("failed to create Internal SystemLink key\n"); }

1 0

Huw Davies : oleaut32: [restricted] members with negative dispids may still be called.
by Alexandre Julliard 07 Feb '12

07 Feb '12

Module: wine Branch: master Commit: 0425a110d92ba61fcb3638443bc7782c9dbd7cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=0425a110d92ba61fcb3638443… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 7 14:28:05 2012 +0000 oleaut32: [restricted] members with negative dispids may still be called. --- dlls/oleaut32/tests/tmarshal.c | 38 ++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 6 +++++ dlls/oleaut32/tests/tmarshal_dispids.h | 2 + dlls/oleaut32/typelib.c | 7 +++++- 4 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 2fbc2e0..e261464 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -660,6 +660,20 @@ static HRESULT WINAPI Widget_put_prop_req_arg( return S_OK; } +static HRESULT WINAPI Widget_restrict(IWidget* iface, INT *i) +{ + trace("restrict\n"); + *i = DISPID_TM_RESTRICTED; + return S_OK; +} + +static HRESULT WINAPI Widget_neg_restrict(IWidget* iface, INT *i) +{ + trace("neg_restrict\n"); + *i = DISPID_TM_NEG_RESTRICTED; + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -696,6 +710,8 @@ static const struct IWidgetVtbl Widget_VTable = Widget_ByRefUInt, Widget_put_prop_opt_arg, Widget_put_prop_req_arg, + Widget_restrict, + Widget_neg_restrict }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -1511,6 +1527,28 @@ static void test_typelibmarshal(void) ok_ole_success(hr, ITypeInfo_Invoke); VariantClear(&varresult); + /* restricted member */ + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.cArgs = 0; + dispparams.rgvarg = NULL; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_RESTRICTED, &IID_NULL, 0x40c, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok( hr == DISP_E_MEMBERNOTFOUND, "got %08x\n", hr ); + VariantClear(&varresult); + + /* restricted member with -ve memid (not restricted) */ + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.cArgs = 0; + dispparams.rgvarg = NULL; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_NEG_RESTRICTED, &IID_NULL, 0x40c, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok( hr == S_OK, "got %08x\n", hr ); + ok(V_VT(&varresult) == VT_I4, "got %x\n", V_VT(&varresult)); + ok(V_I4(&varresult) == DISPID_TM_NEG_RESTRICTED, "got %x\n", V_I4(&varresult)); + VariantClear(&varresult); + IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 30b6d8f..88c13bf 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -149,6 +149,12 @@ library TestTypelib [id(DISPID_TM_PROP_REQ_ARG), propput] HRESULT prop_req_arg([in] INT req, [in] INT i); + + [id(DISPID_TM_RESTRICTED), restricted] + HRESULT restrict([out, retval] INT *i); + + [id(DISPID_TM_NEG_RESTRICTED), restricted] + HRESULT neg_restrict([out, retval] INT *i); } [ diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index 0e49505..8570fe9 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -41,6 +41,8 @@ #define DISPID_TM_PROP_OPT_ARG 22 #define DISPID_TM_PROP_REQ_ARG 23 #define DISPID_TM_VARCARRAY 24 +#define DISPID_TM_RESTRICTED 25 +#define DISPID_TM_NEG_RESTRICTED -26 #define DISPID_NOA_BSTRRET 1 #define DISPID_NOA_ERROR 2 diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 07e294b..95cdc36 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6241,6 +6241,11 @@ DispCallFunc( #endif } +static inline BOOL func_restricted( const FUNCDESC *desc ) +{ + return (desc->wFuncFlags & FUNCFLAG_FRESTRICTED) && (desc->memid >= 0); +} + #define INVBUF_ELEMENT_SIZE \ (sizeof(VARIANTARG) + sizeof(VARIANTARG) + sizeof(VARIANTARG *) + sizeof(VARTYPE)) #define INVBUF_GET_ARG_ARRAY(buffer, params) (buffer) @@ -6297,7 +6302,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( pFuncInfo = &This->funcdescs[fdc]; if ((memid == pFuncInfo->funcdesc.memid) && (wFlags & pFuncInfo->funcdesc.invkind) && - (pFuncInfo->funcdesc.wFuncFlags & FUNCFLAG_FRESTRICTED) == 0) + !func_restricted( &pFuncInfo->funcdesc )) break; }

1 0

Huw Davies : ole32: Don't hold a ref to the drop target in the wrapper. Apps tend to destroy the target object without calling RevokeDragDrop.
by Alexandre Julliard 07 Feb '12

07 Feb '12

Module: wine Branch: master Commit: 5c8edb0449f6c261b9d7d1756011a08decd4c081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8edb0449f6c261b9d7d1756… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 7 12:02:26 2012 +0000 ole32: Don't hold a ref to the drop target in the wrapper. Apps tend to destroy the target object without calling RevokeDragDrop. --- dlls/ole32/ole2.c | 72 +++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 53 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index b449a76..cb667c9 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -382,10 +382,12 @@ static HRESULT create_stream_from_map(HANDLE map, IStream **stream) * IDropTarget::QueryInterface(). Windows doesn't expose this because it * doesn't call CoMarshallInterface() in RegisterDragDrop(). * The wrapper is only used internally, and only exists for the life of - * the marshal. */ + * the marshal. We don't want to hold a ref on the app provided target + * as some apps destroy this prior to CoUninitialize without calling + * RevokeDragDrop. The only (long-term) ref is held by the window prop. */ typedef struct { IDropTarget IDropTarget_iface; - IDropTarget* inner; + HWND hwnd; LONG refs; } DropTargetWrapper; @@ -420,22 +422,34 @@ static ULONG WINAPI DropTargetWrapper_Release(IDropTarget* iface) { DropTargetWrapper* This = impl_from_IDropTarget(iface); ULONG refs = InterlockedDecrement(&This->refs); - if (!refs) - { - IDropTarget_Release(This->inner); - HeapFree(GetProcessHeap(), 0, This); - } + if (!refs) HeapFree(GetProcessHeap(), 0, This); return refs; } +static inline HRESULT get_target_from_wrapper( IDropTarget *wrapper, IDropTarget **target ) +{ + DropTargetWrapper* This = impl_from_IDropTarget( wrapper ); + *target = GetPropW( This->hwnd, prop_oledroptarget ); + if (!*target) return DRAGDROP_E_NOTREGISTERED; + IDropTarget_AddRef( *target ); + return S_OK; +} + static HRESULT WINAPI DropTargetWrapper_DragEnter(IDropTarget* iface, IDataObject* pDataObj, DWORD grfKeyState, POINTL pt, DWORD* pdwEffect) { - DropTargetWrapper* This = impl_from_IDropTarget(iface); - return IDropTarget_DragEnter(This->inner, pDataObj, grfKeyState, pt, pdwEffect); + IDropTarget *target; + HRESULT r = get_target_from_wrapper( iface, &target ); + + if (SUCCEEDED( r )) + { + r = IDropTarget_DragEnter( target, pDataObj, grfKeyState, pt, pdwEffect ); + IDropTarget_Release( target ); + } + return r; } static HRESULT WINAPI DropTargetWrapper_DragOver(IDropTarget* iface, @@ -443,14 +457,28 @@ static HRESULT WINAPI DropTargetWrapper_DragOver(IDropTarget* iface, POINTL pt, DWORD* pdwEffect) { - DropTargetWrapper* This = impl_from_IDropTarget(iface); - return IDropTarget_DragOver(This->inner, grfKeyState, pt, pdwEffect); + IDropTarget *target; + HRESULT r = get_target_from_wrapper( iface, &target ); + + if (SUCCEEDED( r )) + { + r = IDropTarget_DragOver( target, grfKeyState, pt, pdwEffect ); + IDropTarget_Release( target ); + } + return r; } static HRESULT WINAPI DropTargetWrapper_DragLeave(IDropTarget* iface) { - DropTargetWrapper* This = impl_from_IDropTarget(iface); - return IDropTarget_DragLeave(This->inner); + IDropTarget *target; + HRESULT r = get_target_from_wrapper( iface, &target ); + + if (SUCCEEDED( r )) + { + r = IDropTarget_DragLeave( target ); + IDropTarget_Release( target ); + } + return r; } static HRESULT WINAPI DropTargetWrapper_Drop(IDropTarget* iface, @@ -459,8 +487,15 @@ static HRESULT WINAPI DropTargetWrapper_Drop(IDropTarget* iface, POINTL pt, DWORD* pdwEffect) { - DropTargetWrapper* This = impl_from_IDropTarget(iface); - return IDropTarget_Drop(This->inner, pDataObj, grfKeyState, pt, pdwEffect); + IDropTarget *target; + HRESULT r = get_target_from_wrapper( iface, &target ); + + if (SUCCEEDED( r )) + { + r = IDropTarget_Drop( target, pDataObj, grfKeyState, pt, pdwEffect ); + IDropTarget_Release( target ); + } + return r; } static const IDropTargetVtbl DropTargetWrapperVTbl = @@ -474,15 +509,14 @@ static const IDropTargetVtbl DropTargetWrapperVTbl = DropTargetWrapper_Drop }; -static IDropTarget* WrapDropTarget(IDropTarget* inner) +static IDropTarget* WrapDropTarget( HWND hwnd ) { DropTargetWrapper* This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (This) { - IDropTarget_AddRef(inner); This->IDropTarget_iface.lpVtbl = &DropTargetWrapperVTbl; - This->inner = inner; + This->hwnd = hwnd; This->refs = 1; } return &This->IDropTarget_iface; @@ -562,7 +596,7 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) if(FAILED(hr)) return hr; /* IDropTarget::QueryInterface() shouldn't be called, some (broken) apps depend on this. */ - wrapper = WrapDropTarget(pDropTarget); + wrapper = WrapDropTarget( hwnd ); if(!wrapper) { IStream_Release(stream);

1 0

Michael Stefaniuc : inetcpl.cpl: Remove an obsolete resource attribute.
by Alexandre Julliard 07 Feb '12

07 Feb '12

Module: wine Branch: master Commit: 8116d8a53d7467381a26f42d62ba2715b2b8c3c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8116d8a53d7467381a26f42d6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 7 10:09:59 2012 +0100 inetcpl.cpl: Remove an obsolete resource attribute. --- dlls/inetcpl.cpl/inetcpl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/inetcpl.cpl/inetcpl.rc b/dlls/inetcpl.cpl/inetcpl.rc index 49ef5e6..f6ecaac 100644 --- a/dlls/inetcpl.cpl/inetcpl.rc +++ b/dlls/inetcpl.cpl/inetcpl.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_CPL_NAME "Internet Settings" IDS_CPL_INFO "Configure Wine Internet Browser and related settings"

1 0

Michael Stefaniuc : comctl32: Remove an obsolete resource attribute.
by Alexandre Julliard 07 Feb '12

07 Feb '12

Module: wine Branch: master Commit: 482a5746eec602cfbbbe925288a1ef3b127538ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=482a5746eec602cfbbbe92528… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 7 10:18:59 2012 +0100 comctl32: Remove an obsolete resource attribute. --- dlls/comctl32/tests/rsrc.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 76b3642..34b8362 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -64,7 +64,7 @@ FONT 8, "MS Shell Dlg" LTEXT "This has been a test property sheet!", -1, 10, 6, 170, 8 } -IDD_PROP_PAGE_MESSAGE_TEST DIALOG DISCARDABLE 0, 0, 339, 179 +IDD_PROP_PAGE_MESSAGE_TEST DIALOG 0, 0, 339, 179 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Message Test" BEGIN

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
45
Older →

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 February 2012