July 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : rpcrt4: Replace long and unsigned long by more appropriate types.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 8de0242885a6cc49a6b98582aa3378b9c438c629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de0242885a6cc49a6b98582a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 13:42:57 2009 +0200 rpcrt4: Replace long and unsigned long by more appropriate types. --- dlls/rpcrt4/ndr_stubless.h | 2 +- dlls/rpcrt4/rpc_assoc.c | 4 +- dlls/rpcrt4/rpc_assoc.h | 2 +- dlls/rpcrt4/rpc_binding.c | 2 +- dlls/rpcrt4/rpc_defs.h | 18 ++++++++-------- dlls/rpcrt4/rpc_epmap.c | 16 +++++++------- dlls/rpcrt4/rpc_message.c | 49 +++++++++++++++++++++---------------------- dlls/rpcrt4/rpc_message.h | 14 ++++++------ 8 files changed, 53 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8de0242885a6cc49a6b98…

1 0

Alexander Nicolaysen Sørnes : appwiz.cpl : Update Norwegian Bokmål translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: fe3f19dc8265e2a2dc9a385057051b081b417632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3f19dc8265e2a2dc9a38505… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 3 01:58:35 2009 +0200 appwiz.cpl: Update Norwegian Bokmål translation. --- dlls/appwiz.cpl/No.rc | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/appwiz.cpl/No.rc b/dlls/appwiz.cpl/No.rc index 68fd133..889ee83 100644 --- a/dlls/appwiz.cpl/No.rc +++ b/dlls/appwiz.cpl/No.rc @@ -1,7 +1,7 @@ /* -* Add/Remove Programs Norwegian Bokm�l resources +* Add/Remove Programs Norwegian Bokmål resources * -* Copyright 2008 Alexander N. S�rnes <alex(a)thehandofagony.com> +* Copyright 2008-2009 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,6 +21,9 @@ #include "res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE @@ -29,12 +32,13 @@ STRINGTABLE IDS_CPL_DESC, "Lar deg installere ny programvare eller fjerne installerte programmer." IDS_TAB1_TITLE, "Programmer" - IDS_UNINSTALL_FAILED, "Klarte ikke kj�re avinstalleringsprogrammet, �%s�. Vil du fjerne oppf�ringen fra listen over installerte programmer?" + IDS_UNINSTALL_FAILED, "Klarte ikke kjøre avinstalleringsprogrammet, «%s». Vil du fjerne oppføringen fra listen over installerte programmer?" IDS_NOT_SPECIFIED, "Ikke oppgitt" IDS_COLUMN_NAME, "Navn" IDS_COLUMN_PUBLISHER, "Utgiver" IDS_COLUMN_VERSION, "Versjon" + IDS_INSTALL_FILTER, "Installasjonsprogrammer\0*instal*.exe;*setup*.exe;*.msi\0Programmer (*.exe)\0*.exe\0Alle filer (*.*)\0*.*\0\0" } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -42,29 +46,29 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Installer/Avinstaller" FONT 8, "MS Shell Dlg" { - CONTROL "Trykk �Installer� for � installere et program fra en diskett, CD-stasjon eller annet medium.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "Trykk «Installer» for å installere et program fra en diskett, CD-stasjon eller annet medium.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 CONTROL "&Installer...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "F�lgende programmer kan fjernes automatisk. Merk et program og trykk �Legg til/Fjern� for � fjerne det eller endre installerte komponenter", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "Følgende programmer kan fjernes automatisk. Merk et program og trykk «Legg til/Fjern» for å fjerne det eller endre installerte komponenter", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "Legg til/Fje&rn...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 - CONTROL "&St�tteinformasjon...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 170, 198, 70, 14 + CONTROL "&Støtteinformasjon...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 170, 198, 70, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 } IDD_INFO DIALOG 0, 0, 256, 138 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "St�tteinformasjon" +CAPTION "Støtteinformasjon" FONT 8, "MS Shell Dlg" { CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 - CONTROL "F�lgende informasjon kan brukes til � f� teknisk st�tte for %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Følgende informasjon kan brukes til å få teknisk støtte for %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 CONTROL "Utgiver:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 CONTROL "Versjon:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 CONTROL "Kontakt:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 - CONTROL "St�tteinformasjon:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 - CONTROL "Kundest�tte, tlf:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Støtteinformasjon:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Kundestøtte, tlf:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 CONTROL "Lesmeg-fil:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 CONTROL "Produktoppdateringer:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 CONTROL "Kommentarer:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8

1 0

Piotr Caban : jscript: Fix strings allocation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: c001ffae2c68e7e47640f1a9a5895a16b44d08fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c001ffae2c68e7e47640f1a9a… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 3 02:45:32 2009 +0200 jscript: Fix strings allocation. --- dlls/jscript/date.c | 45 +++++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index d20ee96..9dcc8a7 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -531,11 +531,13 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA GetLocaleInfoW(lcid_en, month_id, month, size); len += size-1; - year = year_from_time(time)/10; - while(year) { + year = year_from_time(time); + if(year<0) + year = -year+1; + do { year /= 10; len++; - } + } while(year); year = year_from_time(time); if(year<0) { @@ -544,11 +546,11 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA len += 5; } - day = date_from_time(time)/10; - while(day) { + day = date_from_time(time); + do { day /= 10; len++; - } + } while(day); day = date_from_time(time); offset = date->bias + @@ -733,11 +735,13 @@ static HRESULT Date_toUTCString(DispatchEx *dispex, LCID lcid, WORD flags, DISPP GetLocaleInfoW(lcid_en, month_id, month, size); len += size-1; - year = year_from_time(date->time)/10; - while(year) { + year = year_from_time(date->time); + if(year<0) + year = -year+1; + do { year /= 10; len++; - } + } while(year); year = year_from_time(date->time); if(year<0) { @@ -746,11 +750,11 @@ static HRESULT Date_toUTCString(DispatchEx *dispex, LCID lcid, WORD flags, DISPP len += 5; } - day = date_from_time(date->time)/10; - while(day) { + day = date_from_time(date->time); + do { day /= 10; len++; - } + } while(day); day = date_from_time(date->time); date_str = SysAllocStringLen(NULL, len); @@ -842,11 +846,13 @@ static HRESULT Date_toDateString(DispatchEx *dispex, LCID lcid, WORD flags, DISP GetLocaleInfoW(lcid_en, month_id, month, size); len += size-1; - year = year_from_time(time)/10; - while(year) { + year = year_from_time(time); + if(year<0) + year = -year+1; + do { year /= 10; len++; - } + } while(year); year = year_from_time(time); if(year<0) { @@ -855,11 +861,11 @@ static HRESULT Date_toDateString(DispatchEx *dispex, LCID lcid, WORD flags, DISP len += 5; } - day = date_from_time(time)/10; - while(day) { + day = date_from_time(time); + do { day /= 10; len++; - } + } while(day); day = date_from_time(time); date_str = SysAllocStringLen(NULL, len); @@ -2172,9 +2178,8 @@ static HRESULT create_date(script_ctx_t *ctx, BOOL use_constr, DOUBLE time, Disp DateInstance *date; HRESULT hres; TIME_ZONE_INFORMATION tzi; - DWORD dret; - dret = GetTimeZoneInformation(&tzi); + GetTimeZoneInformation(&tzi); date = heap_alloc_zero(sizeof(DateInstance)); if(!date)

1 0

Alexandre Julliard : ole32/tests: Fix the HMETAFILE_UserSize prototype.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 05beb0daed66a8791f2871aec1e71205ff771c11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05beb0daed66a8791f2871aec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 13:57:21 2009 +0200 ole32/tests: Fix the HMETAFILE_UserSize prototype. --- dlls/ole32/tests/usrmarshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index fde0034..a655397 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -29,7 +29,7 @@ #include "wine/test.h" -ULONG __RPC_USER HMETAFILE_UserSize(ULONG *, unsigned long, HMETAFILE *); +ULONG __RPC_USER HMETAFILE_UserSize(ULONG *, ULONG, HMETAFILE *); unsigned char * __RPC_USER HMETAFILE_UserMarshal(ULONG *, unsigned char *, HMETAFILE *); unsigned char * __RPC_USER HMETAFILE_UserUnmarshal(ULONG *, unsigned char *, HMETAFILE *); void __RPC_USER HMETAFILE_UserFree(ULONG *, HMETAFILE *);

1 0

Detlef Riekenberg : urlmon: Implement the ZoneEnumerator.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 9a7f221b130aa10c1d3639d40e63988419bed2b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7f221b130aa10c1d3639d40… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jul 2 22:04:43 2009 +0200 urlmon: Implement the ZoneEnumerator. --- dlls/urlmon/sec_mgr.c | 158 +++++++++++++++++++++++++++++++++++++++++---- dlls/urlmon/urlmon_main.h | 5 ++ 2 files changed, 149 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 19286b1..47caf18 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -3,6 +3,7 @@ * * Copyright (c) 2004 Huw D M Davies * Copyright 2004 Jacek Caban + * Copyright 2009 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,6 +39,12 @@ static const WCHAR iconW[] = {'I','c','o','n',0}; static const WCHAR minlevelW[] = {'M','i','n','L','e','v','e','l',0}; static const WCHAR recommendedlevelW[] = {'R','e','c','o','m','m','e','n','d','e','d', 'L','e','v','e','l',0}; +static const WCHAR wszZonesKey[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s','\\', + 'Z','o','n','e','s','\\',0}; /******************************************************************** * get_string_from_reg [internal] @@ -205,13 +212,6 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) static HRESULT open_zone_key(HKEY parent_key, DWORD zone, HKEY *hkey) { - static const WCHAR wszZonesKey[] = - {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s','\\', - 'Z','o','n','e','s','\\',0}; static const WCHAR wszFormat[] = {'%','s','%','l','d',0}; WCHAR key_name[sizeof(wszZonesKey)/sizeof(WCHAR)+8]; @@ -673,8 +673,69 @@ HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) typedef struct { const IInternetZoneManagerVtbl* lpVtbl; LONG ref; + LPDWORD *zonemaps; + DWORD zonemap_count; } ZoneMgrImpl; + +/*********************************************************************** + * build_zonemap_from_reg [internal] + * + * Enumerate the Zones in the Registry and return the Zones in a DWORD-array + * The number of the Zones is returned in data[0] + */ +static LPDWORD build_zonemap_from_reg(void) +{ + WCHAR name[32]; + HKEY hkey; + LPDWORD data = NULL; + DWORD allocated = 6; /* space for the zonecount and Zone "0" upto Zone "4" */ + DWORD used = 0; + DWORD res; + DWORD len; + + + res = RegOpenKeyW(HKEY_CURRENT_USER, wszZonesKey, &hkey); + if (res) + return NULL; + + data = heap_alloc(allocated * sizeof(DWORD)); + if (!data) + goto cleanup; + + while (!res) { + name[0] = '\0'; + len = sizeof(name) / sizeof(name[0]); + res = RegEnumKeyExW(hkey, used, name, &len, NULL, NULL, NULL, NULL); + + if (!res) { + used++; + if (used == allocated) { + LPDWORD new_data; + + allocated *= 2; + new_data = heap_realloc_zero(data, allocated * sizeof(DWORD)); + if (!new_data) + goto cleanup; + + data = new_data; + } + data[used] = atoiW(name); + } + } + if (used) { + RegCloseKey(hkey); + data[0] = used; + return data; + } + +cleanup: + /* something failed */ + RegCloseKey(hkey); + heap_free(data); + return NULL; +} + /******************************************************************** * IInternetZoneManager_QueryInterface */ @@ -723,6 +784,8 @@ static ULONG WINAPI ZoneMgrImpl_Release(IInternetZoneManager* iface) TRACE("(%p)->(ref before=%u)\n",This, refCount + 1); if(!refCount) { + while (This->zonemap_count) heap_free(This->zonemaps[--This->zonemap_count]); + heap_free(This->zonemaps); heap_free(This); URLMON_UnlockModule(); } @@ -876,8 +939,51 @@ static HRESULT WINAPI ZoneMgrImpl_CreateZoneEnumerator(IInternetZoneManager* ifa DWORD* pdwCount, DWORD dwFlags) { - FIXME("(%p)->(%p %p %08x) stub\n", iface, pdwEnum, pdwCount, dwFlags); - return E_NOTIMPL; + ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + LPDWORD * new_maps; + LPDWORD data; + DWORD i; + + TRACE("(%p)->(%p, %p, 0x%08x)\n", This, pdwEnum, pdwCount, dwFlags); + if (!pdwEnum || !pdwCount || (dwFlags != 0)) + return E_INVALIDARG; + + data = build_zonemap_from_reg(); + TRACE("found %d zones\n", data ? data[0] : -1); + + if (!data) + return E_FAIL; + + for (i = 0; i < This->zonemap_count; i++) { + if (This->zonemaps && !This->zonemaps[i]) { + This->zonemaps[i] = data; + *pdwEnum = i; + *pdwCount = data[0]; + return S_OK; + } + } + + if (This->zonemaps) { + /* try to double the nr. of pointers in the array */ + new_maps = heap_realloc_zero(This->zonemaps, This->zonemap_count * 2 * sizeof(LPDWORD)); + if (new_maps) + This->zonemap_count *= 2; + } + else + { + This->zonemap_count = 2; + new_maps = heap_alloc_zero(This->zonemap_count * sizeof(LPDWORD)); + } + + if (!new_maps) { + heap_free(data); + return E_FAIL; + } + This->zonemaps = new_maps; + This->zonemaps[i] = data; + *pdwEnum = i; + *pdwCount = data[0]; + return S_OK; } /******************************************************************** @@ -888,8 +994,21 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAt(IInternetZoneManager* iface, DWORD dwIndex, DWORD* pdwZone) { - FIXME("(%p)->(%08x %08x %p) stub\n", iface, dwEnum, dwIndex, pdwZone); - return E_NOTIMPL; + ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + LPDWORD data; + + TRACE("(%p)->(0x%08x, %d, %p)\n", This, dwEnum, dwIndex, pdwZone); + + /* make sure, that dwEnum and dwIndex are in the valid range */ + if (dwEnum < This->zonemap_count) { + if ((data = This->zonemaps[dwEnum])) { + if (dwIndex < data[0]) { + *pdwZone = data[dwIndex + 1]; + return S_OK; + } + } + } + return E_INVALIDARG; } /******************************************************************** @@ -898,8 +1017,19 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAt(IInternetZoneManager* iface, static HRESULT WINAPI ZoneMgrImpl_DestroyZoneEnumerator(IInternetZoneManager* iface, DWORD dwEnum) { - FIXME("(%p)->(%08x) stub\n", iface, dwEnum); - return E_NOTIMPL; + ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + LPDWORD data; + + TRACE("(%p)->(0x%08x)\n", This, dwEnum); + /* make sure, that dwEnum is valid */ + if (dwEnum < This->zonemap_count) { + if ((data = This->zonemaps[dwEnum])) { + This->zonemaps[dwEnum] = NULL; + heap_free(data); + return S_OK; + } + } + return E_INVALIDARG; } /******************************************************************** @@ -937,7 +1067,7 @@ static const IInternetZoneManagerVtbl ZoneMgrImplVtbl = { HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) { - ZoneMgrImpl* ret = heap_alloc(sizeof(ZoneMgrImpl)); + ZoneMgrImpl* ret = heap_alloc_zero(sizeof(ZoneMgrImpl)); TRACE("(%p %p)\n", pUnkOuter, ppobj); ret->lpVtbl = &ZoneMgrImplVtbl; diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 1b5d8d5..62a7e91 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -151,6 +151,11 @@ static inline void *heap_realloc(void *mem, size_t len) return HeapReAlloc(GetProcessHeap(), 0, mem, len); } +static inline void *heap_realloc_zero(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem);

1 0

Detlef Riekenberg : urlmon/tests: Add tests for the ZoneEnumerator.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 694bf576d0d94fa1dfdb6a378655df3018f203f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=694bf576d0d94fa1dfdb6a378… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jul 2 22:08:14 2009 +0200 urlmon/tests: Add tests for the ZoneEnumerator. --- dlls/urlmon/tests/sec_mgr.c | 120 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 120 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 325e1db..e35cf48 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -1,5 +1,6 @@ /* * Copyright 2005-2006 Jacek Caban for CodeWeavers + * Copyright 2009 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -281,6 +282,74 @@ static void test_polices(void) IInternetZoneManager_Release(zonemgr); } +static void test_CreateZoneEnumerator(void) +{ + IInternetZoneManager *zonemgr = NULL; + HRESULT hr; + DWORD dwEnum; + DWORD dwEnum2; + DWORD dwCount; + DWORD dwCount2; + + hr = CoInternetCreateZoneManager(NULL, &zonemgr, 0); + ok(hr == S_OK, "CoInternetCreateZoneManager result: 0x%x\n", hr); + if (FAILED(hr)) + return; + + dwEnum=0xdeadbeef; + hr = IInternetZoneManager_CreateZoneEnumerator(zonemgr, &dwEnum, NULL, 0); + ok((hr == E_INVALIDARG) && (dwEnum == 0xdeadbeef), + "got 0x%x with 0x%x (expected E_INVALIDARG with 0xdeadbeef)\n", hr, dwEnum); + + dwCount=0xdeadbeef; + hr = IInternetZoneManager_CreateZoneEnumerator(zonemgr, NULL, &dwCount, 0); + ok((hr == E_INVALIDARG) && (dwCount == 0xdeadbeef), + "got 0x%x and 0x%x (expected E_INVALIDARG and 0xdeadbeef)\n", hr, dwCount); + + dwEnum=0xdeadbeef; + dwCount=0xdeadbeef; + hr = IInternetZoneManager_CreateZoneEnumerator(zonemgr, &dwEnum, &dwCount, 0xffffffff); + ok((hr == E_INVALIDARG) && (dwEnum == 0xdeadbeef) && (dwCount == 0xdeadbeef), + "got 0x%x with 0x%x and 0x%x (expected E_INVALIDARG with 0xdeadbeef and 0xdeadbeef)\n", + hr, dwEnum, dwCount); + + dwEnum=0xdeadbeef; + dwCount=0xdeadbeef; + hr = IInternetZoneManager_CreateZoneEnumerator(zonemgr, &dwEnum, &dwCount, 1); + ok((hr == E_INVALIDARG) && (dwEnum == 0xdeadbeef) && (dwCount == 0xdeadbeef), + "got 0x%x with 0x%x and 0x%x (expected E_INVALIDARG with 0xdeadbeef and 0xdeadbeef)\n", + hr, dwEnum, dwCount); + + dwEnum=0xdeadbeef; + dwCount=0xdeadbeef; + /* Normal use */ + hr = IInternetZoneManager_CreateZoneEnumerator(zonemgr, &dwEnum, &dwCount, 0); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + if (SUCCEEDED(hr)) { + dwEnum2=0xdeadbeef; + dwCount2=0xdeadbeef; + hr = IInternetZoneManager_CreateZoneEnumerator(zonemgr, &dwEnum2, &dwCount2, 0); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + if (SUCCEEDED(hr)) { + /* native urlmon has an incrementing counter for dwEnum */ + hr = IInternetZoneManager_DestroyZoneEnumerator(zonemgr, dwEnum2); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + } + + hr = IInternetZoneManager_DestroyZoneEnumerator(zonemgr, dwEnum); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + /* Destroy the Enumerator twice is detected and handled in native urlmon */ + hr = IInternetZoneManager_DestroyZoneEnumerator(zonemgr, dwEnum); + ok((hr == E_INVALIDARG), "got 0x%x (expected E_INVALIDARG)\n", hr); + } + + /* ::Release succeed also, when a ::DestroyZoneEnumerator is missing */ + hr = IInternetZoneManager_Release(zonemgr); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); +} + static void test_GetZoneActionPolicy(void) { IInternetZoneManager *zonemgr = NULL; @@ -321,6 +390,55 @@ static void test_GetZoneActionPolicy(void) IInternetZoneManager_Release(zonemgr); } +static void test_GetZoneAt(void) +{ + IInternetZoneManager *zonemgr = NULL; + HRESULT hr; + DWORD dwEnum; + DWORD dwCount; + DWORD dwZone; + DWORD i; + + hr = CoInternetCreateZoneManager(NULL, &zonemgr, 0); + ok(hr == S_OK, "CoInternetCreateZoneManager result: 0x%x\n", hr); + if (FAILED(hr)) + return; + + hr = IInternetZoneManager_CreateZoneEnumerator(zonemgr, &dwEnum, &dwCount, 0); + if (FAILED(hr)) + goto cleanup; + + if (0) { + /* this crashes with native urlmon */ + hr = IInternetZoneManager_GetZoneAt(zonemgr, dwEnum, 0, NULL); + } + + dwZone = 0xdeadbeef; + hr = IInternetZoneManager_GetZoneAt(zonemgr, 0xdeadbeef, 0, &dwZone); + ok(hr == E_INVALIDARG, + "got 0x%x with 0x%x (expected E_INVALIDARG)\n", hr, dwZone); + + for (i = 0; i < dwCount; i++) + { + dwZone = 0xdeadbeef; + hr = IInternetZoneManager_GetZoneAt(zonemgr, dwEnum, i, &dwZone); + ok(hr == S_OK, "#%d: got x%x with %d (expected S_OK)\n", i, hr, dwZone); + } + + dwZone = 0xdeadbeef; + /* MSDN (index .. must be .. less than or equal to) is wrong */ + hr = IInternetZoneManager_GetZoneAt(zonemgr, dwEnum, dwCount, &dwZone); + ok(hr == E_INVALIDARG, + "got 0x%x with 0x%x (expected E_INVALIDARG)\n", hr, dwZone); + + hr = IInternetZoneManager_DestroyZoneEnumerator(zonemgr, dwEnum); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + +cleanup: + hr = IInternetZoneManager_Release(zonemgr); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); +} + static void test_GetZoneAttributes(void) { IInternetZoneManager *zonemgr = NULL; @@ -382,7 +500,9 @@ START_TEST(sec_mgr) test_SecurityManager(); test_polices(); + test_CreateZoneEnumerator(); test_GetZoneActionPolicy(); + test_GetZoneAt(); test_GetZoneAttributes(); OleUninitialize();

1 0

Alexander Nicolaysen Sørnes : shell32: Update Norwegian Bokmål translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 49e0315e86b4d282a88bec803a3f19bea04f1d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e0315e86b4d282a88bec803… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 3 02:04:15 2009 +0200 shell32: Update Norwegian Bokmål translation. --- dlls/shell32/shell32_No.rc | 62 +++++++++++++++++++++++-------------------- 1 files changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/shell32/shell32_No.rc b/dlls/shell32/shell32_No.rc index 12ac088..634c733 100644 --- a/dlls/shell32/shell32_No.rc +++ b/dlls/shell32/shell32_No.rc @@ -1,5 +1,5 @@ /* - * Copyright 2005-2008 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2009 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,12 +18,14 @@ #include "shresdef.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL MENU_001 MENU DISCARDABLE BEGIN MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON - MENUITEM "&Sm� ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Små ikoner", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END @@ -38,7 +40,7 @@ BEGIN POPUP "&Vis" BEGIN MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON - MENUITEM "S&m� ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "S&må ikoner", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END @@ -47,7 +49,7 @@ BEGIN BEGIN MENUITEM "Etter &navn", 0x30 /* column 0 */ MENUITEM "Etter &type", 0x32 /* column 2 */ - MENUITEM "Etter &st�rrelse", 0x31 /* ... */ + MENUITEM "Etter &størrelse", 0x31 /* ... */ MENUITEM "Etter &dato", 0x33 MENUITEM SEPARATOR MENUITEM "Ordne &automatisk", FCIDM_SHVIEW_AUTOARRANGE @@ -79,7 +81,7 @@ BEGIN BEGIN MENUITEM "&Velg" FCIDM_SHVIEW_OPEN MENUITEM "&Utforsk", FCIDM_SHVIEW_EXPLORE - MENUITEM "&�pne", FCIDM_SHVIEW_OPEN + MENUITEM "&Åpne", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR MENUITEM "Klipp &ut", FCIDM_SHVIEW_CUT MENUITEM "&Kopier", FCIDM_SHVIEW_COPY @@ -103,7 +105,7 @@ BEGIN POPUP "&Vis" BEGIN MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON - MENUITEM "&Sm� ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Små ikoner", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END @@ -171,7 +173,7 @@ FONT 10, "MS Shell Dlg" ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 42, 10, 170, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 42, 22, 170, 10 - LTEXT "Kj�rer p� %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Kjører på %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 LTEXT "Wine er laget av", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } @@ -181,8 +183,8 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Skriv inn navnet p� programmet, mappen, dokumentet etter Internett-ressursen du �nsker � �pne.", 12289, 36, 11, 182, 18 - LTEXT "&�pne:", 12305, 7, 39, 24, 10 + LTEXT "Skriv inn navnet på programmet, mappen, dokumentet etter Internett-ressursen du ønsker å åpne.", 12289, 36, 11, 182, 18 + LTEXT "&Åpne:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Avbryt", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP @@ -193,11 +195,11 @@ STRINGTABLE { /* columns in the shellview */ IDS_SHV_COLUMN1 "Fil" - IDS_SHV_COLUMN2 "St�rrelse" + IDS_SHV_COLUMN2 "Størrelse" IDS_SHV_COLUMN3 "Type" IDS_SHV_COLUMN4 "Endret" IDS_SHV_COLUMN5 "Egenskaper" - IDS_SHV_COLUMN6 "St�rrelse" + IDS_SHV_COLUMN6 "Størrelse" IDS_SHV_COLUMN7 "Ledig plass" IDS_SHV_COLUMN8 "Navn" IDS_SHV_COLUMN9 "Kommentarer" @@ -214,23 +216,23 @@ STRINGTABLE /* context menus */ IDS_VIEW_LARGE "&Store ikoner" - IDS_VIEW_SMALL "S&m� ikoner" + IDS_VIEW_SMALL "S&må ikoner" IDS_VIEW_LIST "&Liste" IDS_VIEW_DETAILS "&Detaljer" IDS_SELECT "Velg" - IDS_OPEN "�pne" + IDS_OPEN "Åpne" IDS_CREATEFOLDER_DENIED "Kunne ikke opprette ny mappe: tilgang nektet." IDS_CREATEFOLDER_CAPTION "Klarte ikke opprette ny mappe" IDS_DELETEITEM_CAPTION "Bekreft filsletting" IDS_DELETEFOLDER_CAPTION "Bekreft sletting av mappe" - IDS_DELETEITEM_TEXT "Virkelig slette �%1�?" + IDS_DELETEITEM_TEXT "Virkelig slette «%1»?" IDS_DELETEMULTIPLE_TEXT "Virkelig slette disse %1 elementene?" IDS_DELETESELECTED_TEXT "Virkelig slette valgte element(er)??" - IDS_TRASHITEM_TEXT "Virkelig legge �%1� i papirkurven?" - IDS_TRASHFOLDER_TEXT "Virkelig legge �%1� og alt innholdet i papirkurven?" + IDS_TRASHITEM_TEXT "Virkelig legge «%1» i papirkurven?" + IDS_TRASHFOLDER_TEXT "Virkelig legge «%1» og alt innholdet i papirkurven?" IDS_TRASHMULTIPLE_TEXT "Virkelig legge disse %1 valgte elementene i papirkurven?" - IDS_CANTTRASH_TEXT "Elementet �%1� kan ikke legges i papirkurven. Vil du slette det i stedet?" + IDS_CANTTRASH_TEXT "Elementet «%1» kan ikke legges i papirkurven. Vil du slette det i stedet?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" IDS_OVERWRITEFILE_CAPTION "Bekreft overskriving av fil" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ @@ -239,13 +241,13 @@ STRINGTABLE "the folder?" /* message box strings */ - IDS_RESTART_TITLE "Starte p� nytt" + IDS_RESTART_TITLE "Starte på nytt" IDS_RESTART_PROMPT "Vil du simulere en omstart av Windows?" IDS_SHUTDOWN_TITLE "Avslutt" - IDS_SHUTDOWN_PROMPT "Vil du avslutte Wine-�kten?" + IDS_SHUTDOWN_PROMPT "Vil du avslutte Wine-økten?" /* Run File dialog */ - IDS_RUNDLG_ERROR "Klarte ikke vise Kj�r-vinduet (intern feil)" + IDS_RUNDLG_ERROR "Klarte ikke vise Kjør-vinduet (intern feil)" IDS_RUNDLG_BROWSE_ERROR "Klarte ikke vise Bla-vinduet (intern feil)" IDS_RUNDLG_BROWSE_CAPTION "Bla" IDS_RUNDLG_BROWSE_FILTER "Programfiler\0*.exe\0Alle filer\0*.*\0\0" @@ -273,7 +275,7 @@ STRINGTABLE IDS_MYPICTURES "Mine bilder" IDS_PROGRAM_FILES_COMMON "Programfiler\\Fellesfiler" IDS_COMMON_DOCUMENTS "Dokumenter" - IDS_ADMINTOOLS "Start-meny\\Programmer\\Administrative verkt�y" + IDS_ADMINTOOLS "Start-meny\\Programmer\\Administrative verktøy" IDS_COMMON_MUSIC "Dokumenter\\Min musikk" IDS_COMMON_PICTURES "Dokumenter\\Mine bilder" IDS_COMMON_VIDEO "Dokumenter\\Mine videoklipp" @@ -284,6 +286,8 @@ STRINGTABLE IDS_CPANEL_TITLE "Wine Kontrollpanel" IDS_CPANEL_NAME "Navn" IDS_CPANEL_DESCRIPTION "Beskrivelse" + + IDS_SHLEXEC_NOASSOC "Intet Windows-program er satt opp til å åpne denne filtypen." } STRINGTABLE @@ -291,14 +295,14 @@ STRINGTABLE IDS_LICENSE_CAPTION, "Lisensbetingelser" IDS_LICENSE, "Wine er fri programvare; du kan distribuere det og/eller \ -endre det i henhold til vilk�rene i �GNU Lesser General Public \ -License�, utgitt av the Free Software Foundation; enten \ -versjon 2.1 av Lisensen, eller (hvis du �nsker det) en nyere versjon.\n\n\ -Wine utgis i h�p om at det er nyttig, \ +endre det i henhold til vilkårene i «GNU Lesser General Public \ +License», utgitt av the Free Software Foundation; enten \ +versjon 2.1 av Lisensen, eller (hvis du ønsker det) en nyere versjon.\n\n\ +Wine utgis i håp om at det er nyttig, \ men UTEN ENHVER GARANTI; uten engang den antydede garantien om \ -HANDELSEGNETHET eller EGNETHET FOR ET SPESIELT FORM�L. Se �GNU \ -Lesser General Public License� for flere detaljer.\n\n\ -Du skal ha mottatt et eksemplar av �GNU Lesser General Public \ -License� sammen med dette programmet; hvis ikke, skriv til: the Free Software \ +HANDELSEGNETHET eller EGNETHET FOR ET SPESIELT FORMÅL. Se «GNU \ +Lesser General Public License» for flere detaljer.\n\n\ +Du skal ha mottatt et eksemplar av «GNU Lesser General Public \ +License» sammen med dette programmet; hvis ikke, skriv til: the Free Software \ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." }

1 0

Vincent Povirk : windowscodecs: Implement IsBlackWhite and IsGrayscale for palettes.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: cf8a26aff6b9f73f3184048b4b8beaafb8ec5f2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8a26aff6b9f73f3184048b4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 2 17:44:31 2009 -0500 windowscodecs: Implement IsBlackWhite and IsGrayscale for palettes. --- dlls/windowscodecs/palette.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index a3d67aa..ccf1176 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -186,14 +186,41 @@ static HRESULT WINAPI PaletteImpl_GetColors(IWICPalette *iface, UINT colorCount, static HRESULT WINAPI PaletteImpl_IsBlackWhite(IWICPalette *iface, BOOL *pfIsBlackWhite) { - FIXME("(%p,%p): stub\n", iface, pfIsBlackWhite); - return E_NOTIMPL; + PaletteImpl *This = (PaletteImpl*)iface; + + TRACE("(%p,%p)\n", iface, pfIsBlackWhite); + + if (!pfIsBlackWhite) return E_INVALIDARG; + + if (This->type == WICBitmapPaletteTypeFixedBW) + *pfIsBlackWhite = TRUE; + else + *pfIsBlackWhite = FALSE; + + return S_OK; } static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGrayscale) { - FIXME("(%p,%p): stub\n", iface, pfIsGrayscale); - return E_NOTIMPL; + PaletteImpl *This = (PaletteImpl*)iface; + + TRACE("(%p,%p)\n", iface, pfIsGrayscale); + + if (!pfIsGrayscale) return E_INVALIDARG; + + switch(This->type) + { + case WICBitmapPaletteTypeFixedBW: + case WICBitmapPaletteTypeFixedGray4: + case WICBitmapPaletteTypeFixedGray16: + case WICBitmapPaletteTypeFixedGray256: + *pfIsGrayscale = TRUE; + break; + default: + *pfIsGrayscale = FALSE; + } + + return S_OK; } static HRESULT WINAPI PaletteImpl_HasAlpha(IWICPalette *iface, BOOL *pfHasAlpha)

1 0

Vincent Povirk : windowscodecs: Implement InitializeCustom and GetColors for palettes.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 9f9b71c3ee0a5becef3510d3a6b2a4d11ce6eb73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9b71c3ee0a5becef3510d3a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 2 17:37:06 2009 -0500 windowscodecs: Implement InitializeCustom and GetColors for palettes. --- dlls/windowscodecs/palette.c | 49 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 42aa7f0..cacfd70 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -37,6 +37,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct { const IWICPaletteVtbl *lpIWICPaletteVtbl; LONG ref; + UINT count; + WICColor *colors; + WICBitmapPaletteType type; } PaletteImpl; static HRESULT WINAPI PaletteImpl_QueryInterface(IWICPalette *iface, REFIID iid, @@ -79,7 +82,10 @@ static ULONG WINAPI PaletteImpl_Release(IWICPalette *iface) TRACE("(%p) refcount=%u\n", iface, ref); if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This->colors); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -94,8 +100,29 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, static HRESULT WINAPI PaletteImpl_InitializeCustom(IWICPalette *iface, WICColor *pColors, UINT colorCount) { - FIXME("(%p,%p,%u): stub\n", iface, pColors, colorCount); - return E_NOTIMPL; + PaletteImpl *This = (PaletteImpl*)iface; + WICColor *new_colors; + + TRACE("(%p,%p,%u)\n", iface, pColors, colorCount); + + if (colorCount == 0) + { + new_colors = NULL; + } + else + { + if (!pColors) return E_INVALIDARG; + new_colors = HeapAlloc(GetProcessHeap(), 0, sizeof(WICColor) * colorCount); + if (!new_colors) return E_OUTOFMEMORY; + memcpy(new_colors, pColors, sizeof(WICColor) * colorCount); + } + + HeapFree(GetProcessHeap(), 0, This->colors); + This->colors = new_colors; + This->count = colorCount; + This->type = WICBitmapPaletteTypeCustom; + + return S_OK; } static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *iface, @@ -128,8 +155,19 @@ static HRESULT WINAPI PaletteImpl_GetColorCount(IWICPalette *iface, UINT *pcCoun static HRESULT WINAPI PaletteImpl_GetColors(IWICPalette *iface, UINT colorCount, WICColor *pColors, UINT *pcActualColors) { - FIXME("(%p,%i,%p,%p): stub\n", iface, colorCount, pColors, pcActualColors); - return E_NOTIMPL; + PaletteImpl *This = (PaletteImpl*)iface; + + TRACE("(%p,%i,%p,%p)\n", iface, colorCount, pColors, pcActualColors); + + if (!pColors || !pcActualColors) return E_INVALIDARG; + + if (This->count < colorCount) colorCount = This->count; + + memcpy(pColors, This->colors, sizeof(WICColor) * colorCount); + + *pcActualColors = colorCount; + + return S_OK; } static HRESULT WINAPI PaletteImpl_IsBlackWhite(IWICPalette *iface, BOOL *pfIsBlackWhite) @@ -175,6 +213,9 @@ HRESULT PaletteImpl_Create(IWICPalette **palette) This->lpIWICPaletteVtbl = &PaletteImpl_Vtbl; This->ref = 1; + This->count = 0; + This->colors = NULL; + This->type = WICBitmapPaletteTypeCustom; *palette = (IWICPalette*)This;

1 0

Vincent Povirk : windowscodecs: Add stub implementation of IWICPalette.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 4b9071b37ba272180de501d14db0cdd88a158b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9071b37ba272180de501d14… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 2 17:09:47 2009 -0500 windowscodecs: Add stub implementation of IWICPalette. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/imgfactory.c | 4 +- dlls/windowscodecs/palette.c | 182 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 2 + 4 files changed, 187 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 939a2bf..4de3b62 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ clsfactory.c \ imgfactory.c \ main.c \ + palette.c \ regsvr.c @MAKE_DLL_RULES@ diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 2edcdcd..b727d16 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -140,8 +140,8 @@ static HRESULT WINAPI ImagingFactory_CreateEncoder(IWICImagingFactory *iface, static HRESULT WINAPI ImagingFactory_CreatePalette(IWICImagingFactory *iface, IWICPalette **ppIPalette) { - FIXME("(%p,%p): stub\n", iface, ppIPalette); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIPalette); + return PaletteImpl_Create(ppIPalette); } static HRESULT WINAPI ImagingFactory_CreateFormatConverter(IWICImagingFactory *iface, diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c new file mode 100644 index 0000000..42aa7f0 --- /dev/null +++ b/dlls/windowscodecs/palette.c @@ -0,0 +1,182 @@ +/* + * Copyright 2009 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +typedef struct { + const IWICPaletteVtbl *lpIWICPaletteVtbl; + LONG ref; +} PaletteImpl; + +static HRESULT WINAPI PaletteImpl_QueryInterface(IWICPalette *iface, REFIID iid, + void **ppv) +{ + PaletteImpl *This = (PaletteImpl*)iface; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICPalette, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PaletteImpl_AddRef(IWICPalette *iface) +{ + PaletteImpl *This = (PaletteImpl*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI PaletteImpl_Release(IWICPalette *iface) +{ + PaletteImpl *This = (PaletteImpl*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, + WICBitmapPaletteType ePaletteType, BOOL fAddTransparentColor) +{ + FIXME("(%p,%u,%i): stub\n", iface, ePaletteType, fAddTransparentColor); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_InitializeCustom(IWICPalette *iface, + WICColor *pColors, UINT colorCount) +{ + FIXME("(%p,%p,%u): stub\n", iface, pColors, colorCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *iface, + IWICBitmapSource *pISurface, UINT colorCount, BOOL fAddTransparentColor) +{ + FIXME("(%p,%p,%u,%i): stub\n", iface, pISurface, colorCount, fAddTransparentColor); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_InitializeFromPalette(IWICPalette *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_GetType(IWICPalette *iface, + WICBitmapPaletteType *pePaletteType) +{ + FIXME("(%p,%p): stub\n", iface, pePaletteType); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_GetColorCount(IWICPalette *iface, UINT *pcCount) +{ + FIXME("(%p,%p): stub\n", iface, pcCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_GetColors(IWICPalette *iface, UINT colorCount, + WICColor *pColors, UINT *pcActualColors) +{ + FIXME("(%p,%i,%p,%p): stub\n", iface, colorCount, pColors, pcActualColors); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_IsBlackWhite(IWICPalette *iface, BOOL *pfIsBlackWhite) +{ + FIXME("(%p,%p): stub\n", iface, pfIsBlackWhite); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGrayscale) +{ + FIXME("(%p,%p): stub\n", iface, pfIsGrayscale); + return E_NOTIMPL; +} + +static HRESULT WINAPI PaletteImpl_HasAlpha(IWICPalette *iface, BOOL *pfHasAlpha) +{ + FIXME("(%p,%p): stub\n", iface, pfHasAlpha); + return E_NOTIMPL; +} + +static const IWICPaletteVtbl PaletteImpl_Vtbl = { + PaletteImpl_QueryInterface, + PaletteImpl_AddRef, + PaletteImpl_Release, + PaletteImpl_InitializePredefined, + PaletteImpl_InitializeCustom, + PaletteImpl_InitializeFromBitmap, + PaletteImpl_InitializeFromPalette, + PaletteImpl_GetType, + PaletteImpl_GetColorCount, + PaletteImpl_GetColors, + PaletteImpl_IsBlackWhite, + PaletteImpl_IsGrayscale, + PaletteImpl_HasAlpha +}; + +HRESULT PaletteImpl_Create(IWICPalette **palette) +{ + PaletteImpl *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(PaletteImpl)); + if (!This) return E_OUTOFMEMORY; + + This->lpIWICPaletteVtbl = &PaletteImpl_Vtbl; + This->ref = 1; + + *palette = (IWICPalette*)This; + + return S_OK; +} diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 313dca5..a6e09ff 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -22,6 +22,8 @@ extern HRESULT ImagingFactory_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); extern HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); +extern HRESULT PaletteImpl_Create(IWICPalette **palette); + extern HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, UINT srcwidth, UINT srcheight, INT srcstride, const WICRect *rc, UINT dststride, UINT dstbuffersize, BYTE *dstbuffer);

1 0