January 2011 - Wine-commits

Greg Geldorp : gdi32/tests: Fix System font test for Japanese.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 1e922ebb0720e9e83d93a2a85e6e3a6d70ea1ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e922ebb0720e9e83d93a2a85… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Fri Jan 7 13:03:17 2011 +0100 gdi32/tests: Fix System font test for Japanese. --- dlls/gdi32/tests/font.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 179e846..71a667f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -729,11 +729,7 @@ static void test_bitmap_font_metrics(void) { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 14, 96, FS_LATIN1 }, { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 15, 96, FS_LATIN2 | FS_CYRILLIC }, -/* - * TODO: the system for CP932 should be NORMAL, not BOLD. However that would - * require a new system.sfd for that font - */ - { "System", FW_BOLD, 18, 16, 2, 0, 2, 8, 16, 96, FS_JISJAPAN }, + { "System", FW_NORMAL, 18, 16, 2, 0, 2, 8, 16, 96, FS_JISJAPAN }, { "System", FW_BOLD, 20, 16, 4, 4, 0, 9, 14, 120, FS_LATIN1 }, { "System", FW_BOLD, 20, 16, 4, 4, 0, 9, 17, 120, FS_LATIN2 | FS_CYRILLIC },

1 0

Rex Tsai : wineboot: Update Traditional Chinese translation.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 1a75769263c3bca65437f86cf22b6a303a552626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a75769263c3bca65437f86cf… Author: Rex Tsai <chihchun(a)kalug.linux.org.tw> Date: Fri Jan 7 20:11:02 2011 +0800 wineboot: Update Traditional Chinese translation. --- programs/wineboot/wineboot_Zh.rc | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/wineboot_Zh.rc b/programs/wineboot/wineboot_Zh.rc index 132c0aa..35509eb 100644 --- a/programs/wineboot/wineboot_Zh.rc +++ b/programs/wineboot/wineboot_Zh.rc @@ -3,6 +3,7 @@ * * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> * Copyright 2010 Cheer Xiao <xiaqqaix.at.gmail.com> + * Copyright 2010 Rex Tsai <chihchun.at.kalug.linux.org.tw> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -54,13 +55,23 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL IDD_ENDTASK DIALOG 0, 0, 186, 71 STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "正在等待程式" +CAPTION "等候程式" FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "取消",IDCANCEL,129,49,50,15 - PUSHBUTTON "中斷進程",IDOK,51,49,71,15 - LTEXT "正在模擬關機, 但是這個程式沒有反應.", + PUSHBUTTON "中斷",IDOK,51,49,71,15 + LTEXT "正在模擬關機，但此程序沒有反應。", IDC_STATIC,7,7,172,19 - LTEXT "如果你中斷進程，有可能丟失沒有儲存的數據.", + LTEXT "如果您中斷程式，可能會遺失尚未儲存的資料。", IDC_STATIC,7,28,172,15 END + +IDD_WAITDLG DIALOG 0, 0, 200, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED +CAPTION "Wine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WAITICON, 3, 3, 10, 10 + LTEXT "正在更新 %s 的 Wine 設定，請稍候……", + IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX +END

1 0

Michael Stefaniuc : urlmon: Use an iface instead of a vtbl pointer in ProxyBindStatusCallback.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 2796677f8cc77f05760c8275e7f18e87665ebbd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2796677f8cc77f05760c8275e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 6 22:21:22 2011 +0100 urlmon: Use an iface instead of a vtbl pointer in ProxyBindStatusCallback. --- dlls/urlmon/umstream.c | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index 5a942f6..792cd64 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -32,11 +32,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct ProxyBindStatusCallback { - const IBindStatusCallbackVtbl *lpVtbl; + IBindStatusCallback IBindStatusCallback_iface; IBindStatusCallback *pBSC; } ProxyBindStatusCallback; +static inline ProxyBindStatusCallback *impl_from_IBindStatusCallback(IBindStatusCallback *iface) +{ + return CONTAINING_RECORD(iface, ProxyBindStatusCallback, IBindStatusCallback_iface); +} + static HRESULT WINAPI ProxyBindStatusCallback_QueryInterface(IBindStatusCallback *iface, REFIID riid, void **ppv) { if (IsEqualGUID(&IID_IBindStatusCallback, riid) || @@ -64,7 +69,7 @@ static ULONG WINAPI ProxyBindStatusCallback_Release(IBindStatusCallback *iface) static HRESULT WINAPI ProxyBindStatusCallback_OnStartBinding(IBindStatusCallback *iface, DWORD dwReserved, IBinding *pib) { - ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_OnStartBinding(This->pBSC, dwReserved, pib); @@ -74,7 +79,7 @@ static HRESULT WINAPI ProxyBindStatusCallback_OnStartBinding(IBindStatusCallback static HRESULT WINAPI ProxyBindStatusCallback_GetPriority(IBindStatusCallback *iface, LONG *pnPriority) { - ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_GetPriority(This->pBSC, pnPriority); @@ -84,7 +89,7 @@ static HRESULT WINAPI ProxyBindStatusCallback_GetPriority(IBindStatusCallback *i static HRESULT WINAPI ProxyBindStatusCallback_OnLowResource(IBindStatusCallback *iface, DWORD reserved) { - ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_OnLowResource(This->pBSC, reserved); @@ -95,7 +100,7 @@ static HRESULT WINAPI ProxyBindStatusCallback_OnLowResource(IBindStatusCallback static HRESULT WINAPI ProxyBindStatusCallback_OnProgress(IBindStatusCallback *iface, ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) { - ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_OnProgress(This->pBSC, ulProgress, @@ -107,7 +112,7 @@ static HRESULT WINAPI ProxyBindStatusCallback_OnProgress(IBindStatusCallback *if static HRESULT WINAPI ProxyBindStatusCallback_OnStopBinding(IBindStatusCallback *iface, HRESULT hresult, LPCWSTR szError) { - ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_OnStopBinding(This->pBSC, hresult, szError); @@ -117,7 +122,7 @@ static HRESULT WINAPI ProxyBindStatusCallback_OnStopBinding(IBindStatusCallback static HRESULT WINAPI ProxyBindStatusCallback_GetBindInfo(IBindStatusCallback *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { - ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_GetBindInfo(This->pBSC, grfBINDF, pbindinfo); @@ -128,7 +133,7 @@ static HRESULT WINAPI ProxyBindStatusCallback_GetBindInfo(IBindStatusCallback *i static HRESULT WINAPI ProxyBindStatusCallback_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF, DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) { - ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_OnDataAvailable(This->pBSC, grfBSCF, dwSize, @@ -139,7 +144,7 @@ static HRESULT WINAPI ProxyBindStatusCallback_OnDataAvailable(IBindStatusCallbac static HRESULT WINAPI ProxyBindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface, REFIID riid, IUnknown *punk) { - ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_OnObjectAvailable(This->pBSC, riid, punk); @@ -170,7 +175,7 @@ static const IBindStatusCallbackVtbl BlockingBindStatusCallbackVtbl = static HRESULT WINAPI AsyncBindStatusCallback_GetBindInfo(IBindStatusCallback *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { - ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); HRESULT hr = IBindStatusCallback_GetBindInfo(This->pBSC, grfBINDF, pbindinfo); *grfBINDF |= BINDF_PULLDATA | BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE; return hr; @@ -276,10 +281,10 @@ HRESULT WINAPI URLOpenBlockingStreamW(LPUNKNOWN pCaller, LPCWSTR szURL, if (!szURL || !ppStream) return E_INVALIDARG; - blocking_bsc.lpVtbl = &BlockingBindStatusCallbackVtbl; + blocking_bsc.IBindStatusCallback_iface.lpVtbl = &BlockingBindStatusCallbackVtbl; blocking_bsc.pBSC = lpfnCB; - return URLStartDownload(szURL, ppStream, (IBindStatusCallback *)&blocking_bsc); + return URLStartDownload(szURL, ppStream, &blocking_bsc.IBindStatusCallback_iface); } /*********************************************************************** @@ -326,10 +331,10 @@ HRESULT WINAPI URLOpenStreamW(LPUNKNOWN pCaller, LPCWSTR szURL, DWORD dwReserved if (!szURL) return E_INVALIDARG; - async_bsc.lpVtbl = &AsyncBindStatusCallbackVtbl; + async_bsc.IBindStatusCallback_iface.lpVtbl = &AsyncBindStatusCallbackVtbl; async_bsc.pBSC = lpfnCB; - hr = URLStartDownload(szURL, &pStream, (IBindStatusCallback *)&async_bsc); + hr = URLStartDownload(szURL, &pStream, &async_bsc.IBindStatusCallback_iface); if (SUCCEEDED(hr) && pStream) IStream_Release(pStream);

1 0

Michael Stefaniuc : ole32: COM cleanup for the IMalloc iface.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: a9ae183d8a1567e98100898ed6574758384827c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9ae183d8a1567e98100898ed… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 6 22:21:58 2011 +0100 ole32: COM cleanup for the IMalloc iface. --- dlls/ole32/ifs.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 1a10c3e..a4857d4 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -50,7 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(olemalloc); static const IMallocVtbl VT_IMalloc32; typedef struct { - const IMallocVtbl *lpVtbl; + IMalloc IMalloc_iface; DWORD dummy; /* nothing, we are static */ IMallocSpy * pSpy; /* the spy when active */ DWORD SpyedAllocationsLeft; /* number of spyed allocations left */ @@ -60,7 +60,7 @@ typedef struct { } _Malloc32; /* this is the static object instance */ -static _Malloc32 Malloc32 = {&VT_IMalloc32, 0, NULL, 0, 0, NULL, 0}; +static _Malloc32 Malloc32 = {{&VT_IMalloc32}, 0, NULL, 0, 0, NULL, 0}; /* with a spy active all calls from pre to post methods are threadsave */ static CRITICAL_SECTION IMalloc32_SpyCS; @@ -374,7 +374,7 @@ static const IMallocVtbl VT_IMalloc32 = */ HRESULT WINAPI CoGetMalloc(DWORD dwMemContext, LPMALLOC *lpMalloc) { - *lpMalloc = (LPMALLOC)&Malloc32; + *lpMalloc = &Malloc32.IMalloc_iface; return S_OK; } @@ -392,7 +392,7 @@ HRESULT WINAPI CoGetMalloc(DWORD dwMemContext, LPMALLOC *lpMalloc) */ LPVOID WINAPI CoTaskMemAlloc(ULONG size) { - return IMalloc_Alloc((LPMALLOC)&Malloc32,size); + return IMalloc_Alloc(&Malloc32.IMalloc_iface,size); } /*********************************************************************** @@ -408,7 +408,7 @@ LPVOID WINAPI CoTaskMemAlloc(ULONG size) */ VOID WINAPI CoTaskMemFree(LPVOID ptr) { - IMalloc_Free((LPMALLOC)&Malloc32, ptr); + IMalloc_Free(&Malloc32.IMalloc_iface, ptr); } /*********************************************************************** @@ -426,7 +426,7 @@ VOID WINAPI CoTaskMemFree(LPVOID ptr) */ LPVOID WINAPI CoTaskMemRealloc(LPVOID pvOld, ULONG size) { - return IMalloc_Realloc((LPMALLOC)&Malloc32, pvOld, size); + return IMalloc_Realloc(&Malloc32.IMalloc_iface, pvOld, size); } /***********************************************************************

1 0

Michael Stefaniuc : msdaps: COM cleanup for the IClassFactory iface.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 5c40a8a9ac64032b5837f0e6bf6081db1b255de9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c40a8a9ac64032b5837f0e6b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 6 22:21:32 2011 +0100 msdaps: COM cleanup for the IClassFactory iface. --- dlls/msdaps/main.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/msdaps/main.c b/dlls/msdaps/main.c index 9b5afaa..b673b58 100644 --- a/dlls/msdaps/main.c +++ b/dlls/msdaps/main.c @@ -60,13 +60,18 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) */ typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; HRESULT (*create_object)( IUnknown*, LPVOID* ); } cf; +static inline cf *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, cf, IClassFactory_iface); +} + static HRESULT WINAPI CF_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) { - cf *This = (cf *)iface; + cf *This = impl_from_IClassFactory(iface); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), obj); @@ -92,7 +97,7 @@ static ULONG WINAPI CF_Release(IClassFactory *iface) static HRESULT WINAPI CF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **obj) { - cf *This = (cf *)iface; + cf *This = impl_from_IClassFactory(iface); IUnknown *unk = NULL; HRESULT r; @@ -122,10 +127,10 @@ static const IClassFactoryVtbl CF_Vtbl = CF_LockServer }; -static cf row_server_cf = { &CF_Vtbl, create_row_server }; -static cf row_proxy_cf = { &CF_Vtbl, create_row_marshal }; -static cf rowset_server_cf = { &CF_Vtbl, create_rowset_server }; -static cf rowset_proxy_cf = { &CF_Vtbl, create_rowset_marshal }; +static cf row_server_cf = { { &CF_Vtbl }, create_row_server }; +static cf row_proxy_cf = { { &CF_Vtbl }, create_row_marshal }; +static cf rowset_server_cf = { { &CF_Vtbl }, create_rowset_server }; +static cf rowset_proxy_cf = { { &CF_Vtbl }, create_rowset_marshal }; /*********************************************************************** * DllGetClassObject

1 0

Michael Stefaniuc : oleaut32/tests: COM cleanup for vartest.c.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 65941a66c3001d36d239b47ecc4b58f90177df8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=65941a66c3001d36d239b47ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 6 22:21:50 2011 +0100 oleaut32/tests: COM cleanup for vartest.c. --- dlls/oleaut32/tests/vartest.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index ee56c16..d1388dd 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -24,6 +24,8 @@ #include <math.h> #include <float.h> +#define CONST_VTABLE + #include "windef.h" #include "winbase.h" #include "winsock.h" @@ -399,26 +401,31 @@ static int IsValidVariantClearVT(VARTYPE vt, VARTYPE extraFlags) typedef struct { - const IUnknownVtbl *lpVtbl; - LONG ref; - LONG events; + IUnknown IUnknown_iface; + LONG ref; + LONG events; } test_VariantClearImpl; +static inline test_VariantClearImpl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, test_VariantClearImpl, IUnknown_iface); +} + static HRESULT WINAPI VC_QueryInterface(LPUNKNOWN iface,REFIID riid,LPVOID *ppobj) { - test_VariantClearImpl *This = (test_VariantClearImpl *)iface; + test_VariantClearImpl *This = impl_from_IUnknown(iface); This->events |= 0x1; return E_NOINTERFACE; } static ULONG WINAPI VC_AddRef(LPUNKNOWN iface) { - test_VariantClearImpl *This = (test_VariantClearImpl *)iface; + test_VariantClearImpl *This = impl_from_IUnknown(iface); This->events |= 0x2; return InterlockedIncrement(&This->ref); } static ULONG WINAPI VC_Release(LPUNKNOWN iface) { - test_VariantClearImpl *This = (test_VariantClearImpl *)iface; + test_VariantClearImpl *This = impl_from_IUnknown(iface); /* static class, won't be freed */ This->events |= 0x4; return InterlockedDecrement(&This->ref); @@ -430,7 +437,7 @@ static const IUnknownVtbl test_VariantClear_vtbl = { VC_Release, }; -static test_VariantClearImpl test_myVariantClearImpl = {&test_VariantClear_vtbl, 1, 0}; +static test_VariantClearImpl test_myVariantClearImpl = {{&test_VariantClear_vtbl}, 1, 0}; static void test_VariantClear(void) { @@ -509,17 +516,17 @@ static void test_VariantClear(void) /* UNKNOWN */ V_VT(&v) = VT_UNKNOWN; - V_UNKNOWN(&v) = (IUnknown*)&test_myVariantClearImpl; + V_UNKNOWN(&v) = &test_myVariantClearImpl.IUnknown_iface; test_myVariantClearImpl.events = 0; hres = VariantClear(&v); ok(hres == S_OK, "ret %08x\n", hres); ok(V_VT(&v) == 0, "vt %04x\n", V_VT(&v)); - ok(V_UNKNOWN(&v) == (IUnknown*)&test_myVariantClearImpl, "unknown %p\n", V_UNKNOWN(&v)); + ok(V_UNKNOWN(&v) == &test_myVariantClearImpl.IUnknown_iface, "unknown %p\n", V_UNKNOWN(&v)); /* Check that Release got called, but nothing else */ ok(test_myVariantClearImpl.events == 0x4, "Unexpected call. events %08x\n", test_myVariantClearImpl.events); /* UNKNOWN BYREF */ - punk = (IUnknown*)&test_myVariantClearImpl; + punk = &test_myVariantClearImpl.IUnknown_iface; V_VT(&v) = VT_UNKNOWN | VT_BYREF; V_UNKNOWNREF(&v) = &punk; test_myVariantClearImpl.events = 0; @@ -542,7 +549,7 @@ static void test_VariantClear(void) ok(test_myVariantClearImpl.events == 0x4, "Unexpected call. events %08x\n", test_myVariantClearImpl.events); /* DISPATCH BYREF */ - punk = (IUnknown*)&test_myVariantClearImpl; + punk = &test_myVariantClearImpl.IUnknown_iface; V_VT(&v) = VT_DISPATCH | VT_BYREF; V_DISPATCHREF(&v) = (IDispatch**)&punk; test_myVariantClearImpl.events = 0;

1 0

Michael Stefaniuc : shlwapi/tests: COM cleanup for thread.c.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 3b2b23d808b99df0f621ec455fa1cbd2f75bd647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b2b23d808b99df0f621ec455… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 6 22:22:09 2011 +0100 shlwapi/tests: COM cleanup for thread.c. --- dlls/shlwapi/tests/thread.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/tests/thread.c b/dlls/shlwapi/tests/thread.c index 24d5be1..cee87e7 100644 --- a/dlls/shlwapi/tests/thread.c +++ b/dlls/shlwapi/tests/thread.c @@ -21,6 +21,8 @@ #include <stdarg.h> #define COBJMACROS +#define CONST_VTABLE + #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -37,13 +39,18 @@ static DWORD AddRef_called; typedef struct { - const IUnknownVtbl* lpVtbl; + IUnknown IUnknown_iface; LONG *ref; } threadref; +static inline threadref *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, threadref, IUnknown_iface); +} + static HRESULT WINAPI threadref_QueryInterface(IUnknown *iface, REFIID riid, LPVOID *ppvObj) { - threadref * This = (threadref *)iface; + threadref * This = impl_from_IUnknown(iface); trace("unexpected QueryInterface(%p, %p, %p) called\n", This, riid, ppvObj); *ppvObj = NULL; @@ -52,7 +59,7 @@ static HRESULT WINAPI threadref_QueryInterface(IUnknown *iface, REFIID riid, LPV static ULONG WINAPI threadref_AddRef(IUnknown *iface) { - threadref * This = (threadref *)iface; + threadref * This = impl_from_IUnknown(iface); AddRef_called++; return InterlockedIncrement(This->ref); @@ -60,7 +67,7 @@ static ULONG WINAPI threadref_AddRef(IUnknown *iface) static ULONG WINAPI threadref_Release(IUnknown *iface) { - threadref * This = (threadref *)iface; + threadref * This = impl_from_IUnknown(iface); trace("unexpected Release(%p) called\n", This); return InterlockedDecrement(This->ref); @@ -76,7 +83,7 @@ static const IUnknownVtbl threadref_vt = static void init_threadref(threadref* iface, LONG *refcount) { - iface->lpVtbl = &threadref_vt; + iface->IUnknown_iface.lpVtbl = &threadref_vt; iface->ref = refcount; } @@ -209,7 +216,7 @@ static void test_SHSetThreadRef(void) init_threadref(&ref, &refcount); AddRef_called = 0; refcount = 1; - hr = pSHSetThreadRef( (IUnknown *)&ref); + hr = pSHSetThreadRef(&ref.IUnknown_iface); ok( (hr == S_OK) && (refcount == 1) && (!AddRef_called), "got 0x%x with %d, %d (expected S_OK with 1, 0)\n", hr, refcount, AddRef_called); @@ -219,7 +226,7 @@ static void test_SHSetThreadRef(void) refcount = 1; punk = NULL; hr = pSHGetThreadRef(&punk); - ok( (hr == S_OK) && (punk == (IUnknown *)&ref) && (refcount == 2) && (AddRef_called == 1), + ok( (hr == S_OK) && (punk == &ref.IUnknown_iface) && (refcount == 2) && (AddRef_called == 1), "got 0x%x and %p with %d, %d (expected S_OK and %p with 2, 1)\n", hr, punk, refcount, AddRef_called, &ref);

1 0

Stefan Leichter : setupapi: Add stub for SetupDiSetSelectedDevice.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 8fffb22f1e3e81dd5f745020f6fb235a9794697b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fffb22f1e3e81dd5f745020f… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Jan 6 23:49:18 2011 +0100 setupapi: Add stub for SetupDiSetSelectedDevice. --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ include/setupapi.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index f91d0d8..54083be 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -387,7 +387,7 @@ @ stdcall SetupDiSetDeviceRegistryPropertyW(ptr ptr long ptr ptr) @ stub SetupDiSetDriverInstallParamsA @ stub SetupDiSetDriverInstallParamsW -@ stub SetupDiSetSelectedDevice +@ stdcall SetupDiSetSelectedDevice(ptr ptr) @ stub SetupDiSetSelectedDriverA @ stub SetupDiSetSelectedDriverW @ stub SetupDiUnremoveDevice diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 2354d84..8ba17d7 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -426,3 +426,13 @@ BOOL WINAPI SetupDiLoadClassIcon(const GUID *ClassGuid, HICON *LargeIcon, PINT M SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/*********************************************************************** + * SetupDiSetSelectedDevice (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSetSelectedDevice(HDEVINFO SetupDiSetSelectedDevice, PSP_DEVINFO_DATA DeviceInfoData) +{ + FIXME("(%p, %p) stub\n", SetupDiSetSelectedDevice, DeviceInfoData); + + return TRUE; +} diff --git a/include/setupapi.h b/include/setupapi.h index c4e1664..c15ec52 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1635,6 +1635,7 @@ BOOL WINAPI SetupDiSetDeviceRegistryPropertyW(HDEVINFO, PSP_DEVINFO_DATA, DW BOOL WINAPI SetupDiSetDriverInstallParamsA(HDEVINFO, PSP_DEVINFO_DATA, PSP_DRVINFO_DATA_A, PSP_DRVINSTALL_PARAMS); BOOL WINAPI SetupDiSetDriverInstallParamsW(HDEVINFO, PSP_DEVINFO_DATA, PSP_DRVINFO_DATA_W, PSP_DRVINSTALL_PARAMS); #define SetupDiSetDriverInstallParams WINELIB_NAME_AW(SetupDiSetDriverInstallParams) +BOOL WINAPI SetupDiSetSelectedDevice(HDEVINFO, PSP_DEVINFO_DATA); BOOL WINAPI SetupDiSetSelectedDriverA(HDEVINFO, PSP_DEVINFO_DATA, PSP_DRVINFO_DATA_A); BOOL WINAPI SetupDiSetSelectedDriverW(HDEVINFO, PSP_DEVINFO_DATA, PSP_DRVINFO_DATA_W); #define SetupDiSetSelectedDriver WINELIB_NAME_AW(SetupDiSetSelectedDriver)

1 0

Hwang YunSong : winemine: Update Korean resource.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 3f19582101e35f10f9544dca82ebde719d51edb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f19582101e35f10f9544dca8… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Jan 7 10:58:19 2011 +0900 winemine: Update Korean resource. --- programs/winemine/Ko.rc | 63 +++++++++++++++++++++++++--------------------- 1 files changed, 34 insertions(+), 29 deletions(-) diff --git a/programs/winemine/Ko.rc b/programs/winemine/Ko.rc index d87b516..7f74668 100644 --- a/programs/winemine/Ko.rc +++ b/programs/winemine/Ko.rc @@ -4,7 +4,7 @@ * * Copyright 2000 Joshua Thielen * Copyright 2003 Marcelo Duarte - * Copyright 2005,2007 YunSong Hwang + * Copyright 2005,2007,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,73 +23,78 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_APPNAME, "Wine��ã��" - IDS_NOBODY, "�ƹ��" + IDS_APPNAME, "Wine지뢰찾기" + IDS_NOBODY, "아무개" IDS_ABOUT, "Copyright 2000 Joshua Thielen" } MENU_WINEMINE MENU { - POPUP "�ɼ�(&O)" { - MENUITEM "�� (&N)\tF2", IDM_NEW + POPUP "옵션(&O)" { + MENUITEM "새 게임(&N)\tF2", IDM_NEW MENUITEM SEPARATOR - MENUITEM "��ǥ ǥ��(&M)", IDM_MARKQ + MENUITEM "물음표 표시(&M)", IDM_MARKQ MENUITEM SEPARATOR - MENUITEM "�ʺ��(&B)", IDM_BEGINNER - MENUITEM "�߱��(&A)", IDM_ADVANCED - MENUITEM "��(&E)", IDM_EXPERT - MENUITEM "�� (&C)", IDM_CUSTOM + MENUITEM "초보자(&B)", IDM_BEGINNER + MENUITEM "중급자(&A)", IDM_ADVANCED + MENUITEM "상급자(&E)", IDM_EXPERT + MENUITEM "사용자 정의(&C)", IDM_CUSTOM MENUITEM SEPARATOR - MENUITEM "��(&X)\tAlt+X", IDM_EXIT + MENUITEM "나가기(&X)\tAlt+X", IDM_EXIT } - POPUP "��(&I)" { - MENUITEM "�� ð�(&F)", IDM_TIMES - MENUITEM "��(&A)", IDM_ABOUT + POPUP "도움말(&I)" { + MENUITEM "가장 빠른 시간(&F)", IDM_TIMES + MENUITEM "정보(&A)", IDM_ABOUT } } DLG_TIMES DIALOG 0, 0, 160, 80 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "�� ð�" +CAPTION "가장 빠른 시간" +FONT 9, "MS Shell Dlg" { - GROUPBOX "�ִ� �ð�", -1, 10, 10, 140, 45 - LTEXT "�ʺ��", -1, 20, 20, 40, 8 - LTEXT "�߱��", -1, 20, 30, 40, 8 - LTEXT "��", -1, 20, 40, 40, 8 + GROUPBOX "최단 시간", -1, 10, 10, 140, 45 + LTEXT "초보자", -1, 20, 20, 40, 8 + LTEXT "중급자", -1, 20, 30, 40, 8 + LTEXT "전문가", -1, 20, 40, 40, 8 LTEXT "999", IDC_TIME1, 70, 20, 15, 8 LTEXT "999", IDC_TIME2, 70, 30, 15, 8 LTEXT "999", IDC_TIME3, 70, 40, 15, 8 LTEXT "", IDC_NAME1, 90, 20, 55, 8 LTEXT "", IDC_NAME2, 90, 30, 55, 8 LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "Ȯ��", IDOK, 55, 60, 50, 15 + DEFPUSHBUTTON "확인", IDOK, 55, 60, 50, 15 } DLG_CONGRATS DIALOG 0, 0, 160, 60 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "��մϴ�!" +CAPTION "축하합니다!" +FONT 9, "MS Shell Dlg" { - LTEXT "�� ̸�� ּ��", -1, 10, 10, 150, 10 + LTEXT "당신의 이름을 적어주세요", -1, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "Ȯ��", IDOK, 60, 40, 40, 15 + DEFPUSHBUTTON "확인", IDOK, 60, 40, 40, 15 } DLG_CUSTOM DIALOG 0, 0, 100, 100 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "�� " +CAPTION "게임 사용자 정의 " +FONT 9, "MS Shell Dlg" { - LTEXT "��", -1, 5, 5, 30, 10 - LTEXT "��", -1, 5, 35, 30, 10 - LTEXT "��", -1, 5, 65, 30, 10 + LTEXT "가로줄", -1, 5, 5, 30, 10 + LTEXT "새로줄", -1, 5, 35, 30, 10 + LTEXT "지뢰", -1, 5, 65, 30, 10 EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER - DEFPUSHBUTTON "Ȯ��", IDOK, 40, 30, 50, 15 - PUSHBUTTON "��", IDCANCEL, 40, 50, 50, 15 + DEFPUSHBUTTON "확인", IDOK, 40, 30, 50, 15 + PUSHBUTTON "취소", IDCANCEL, 40, 50, 50, 15 }

1 0

Hwang YunSong : wineps.drv: Update Korean resource.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: d512ccdfa14e5411c8f56801e35b25d7bb8cc420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d512ccdfa14e5411c8f56801e… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Jan 7 10:59:58 2011 +0900 wineps.drv: Update Korean resource. --- dlls/wineps.drv/wps_Ko.rc | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wineps.drv/wps_Ko.rc b/dlls/wineps.drv/wps_Ko.rc index c07c116..6e4b9c2 100644 --- a/dlls/wineps.drv/wps_Ko.rc +++ b/dlls/wineps.drv/wps_Ko.rc @@ -1,6 +1,6 @@ /* * Copyright 2002 Won-kyu Park <wkpark(a)kldp.org> - * Copyright 2005 YunSong Hwang + * Copyright 2005,2011 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,22 +19,24 @@ #include "psdlg.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT PAPER DIALOG 5, 43, 227, 215 STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE -CAPTION "��" +CAPTION "종이" FONT 9, "MS Shell Dlg" { - LTEXT "�� ũ��(&Z):", -1, 10, 6, 100, 8 + LTEXT "종이 크기(&Z):", -1, 10, 6, 100, 8 LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | WS_TABSTOP - GROUPBOX "��", -1, 10, 80, 200, 50 - CONTROL "��(&P)", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + GROUPBOX "방향", -1, 10, 80, 200, 50 + CONTROL "세로(&P)", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 90, 60, 10 - CONTROL "��(&L)", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, + CONTROL "가로(&L)", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, 20, 110, 60, 10 - LTEXT "�� :", IDD_DUPLEX_NAME, 10, 140, 100, 8 + LTEXT "양방향 통신:", IDD_DUPLEX_NAME, 10, 140, 100, 8 COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP }

1 0