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

Jacek Caban : mshtml: Fixed tests on Vista.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: 68fa7d3b0e9c34f821b79ad093c81156ea29463e URL: http://source.winehq.org/git/wine.git/?a=commit;h=68fa7d3b0e9c34f821b79ad09… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 23 14:03:27 2012 +0200 mshtml: Fixed tests on Vista. --- dlls/mshtml/tests/htmldoc.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 3a35abf..803d505 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -191,6 +191,7 @@ DEFINE_EXPECT(GetPendingUrl); DEFINE_EXPECT(ActiveElementChanged); DEFINE_EXPECT(IsErrorUrl); DEFINE_EXPECT(get_LocationURL); +DEFINE_EXPECT(CountEntries); static IUnknown *doc_unk; static IMoniker *doc_mon; @@ -3245,7 +3246,7 @@ static HRESULT WINAPI TravelLog_Clone(ITravelLog *iface, ITravelLog **pptl) static DWORD WINAPI TravelLog_CountEntries(ITravelLog *iface, IUnknown *punk) { - ok(0, "unexpected call\n"); + CHECK_EXPECT(CountEntries); return E_NOTIMPL; } @@ -5069,6 +5070,8 @@ static void test_download(DWORD flags) SET_EXPECT(Exec_ShellDocView_140); if(!is_js) { SET_EXPECT(Exec_MSHTML_PARSECOMPLETE); + if(support_wbapp) /* Called on some Vista installations */ + SET_EXPECT(CountEntries); SET_EXPECT(Exec_HTTPEQUIV_DONE); } SET_EXPECT(SetStatusText); @@ -5158,6 +5161,8 @@ static void test_download(DWORD flags) CLEAR_CALLED(Exec_ShellDocView_140); if(!is_js) { CHECK_CALLED(Exec_MSHTML_PARSECOMPLETE); + if(support_wbapp) /* Called on some Vista installations */ + CLEAR_CALLED(CountEntries); CHECK_CALLED(Exec_HTTPEQUIV_DONE); } SET_CALLED(SetStatusText);

1 0

Jacek Caban : mshtml: Unescape script from javascript: URLs before executing them.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: 5401efaef0d12a3c36e4491f6f194d5deb94e73d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5401efaef0d12a3c36e4491f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 23 14:03:45 2012 +0200 mshtml: Unescape script from javascript: URLs before executing them. --- dlls/mshtml/navigate.c | 6 ++++++ dlls/mshtml/tests/htmldoc.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ecc8ef3..09c9f3d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1789,6 +1789,12 @@ static void navigate_javascript_proc(task_t *_task) if(FAILED(hres)) return; + hres = UrlUnescapeW(code, NULL, NULL, URL_UNESCAPE_INPLACE); + if(FAILED(hres)) { + SysFreeString(code); + return; + } + set_download_state(window->doc_obj, 1); V_VT(&v) = VT_EMPTY; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 803d505..d8cef24 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6874,7 +6874,7 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_put_href(doc, FALSE, "#test", "http://www.winehq.org/#test", FALSE, TRUE, 0); test_travellog(doc); } - test_put_href(doc, FALSE, NULL, "javascript:external&&undefined", TRUE, FALSE, 0); + test_put_href(doc, FALSE, NULL, "javascript:external%20&&undefined", TRUE, FALSE, 0); test_put_href(doc, FALSE, NULL, "about:blank", FALSE, FALSE, support_wbapp ? DWL_EXPECT_HISTUPDATE : 0); test_put_href(doc, TRUE, NULL, "about:replace", FALSE, FALSE, 0);

1 0

Jacek Caban : jscript: Don' t expose properties belonging to Object prototype from Object instance.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: a2c2103cd3c78e3a570d80bba27b1355ce543465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c2103cd3c78e3a570d80bba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 23 15:53:22 2012 +0200 jscript: Don't expose properties belonging to Object prototype from Object instance. --- dlls/jscript/object.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index ce43eb5..173c227 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -211,6 +211,14 @@ static const builtin_info_t Object_info = { NULL }; +static const builtin_info_t ObjectInst_info = { + JSCLASS_OBJECT, + {NULL, Object_value, 0}, + 0, NULL, + Object_destructor, + NULL +}; + static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, VARIANT *argv, VARIANT *retv, jsexcept_t *ei) { @@ -282,7 +290,7 @@ HRESULT create_object(script_ctx_t *ctx, jsdisp_t *constr, jsdisp_t **ret) if(!object) return E_OUTOFMEMORY; - hres = init_dispex_from_constr(object, ctx, &Object_info, constr ? constr : ctx->object_constr); + hres = init_dispex_from_constr(object, ctx, &ObjectInst_info, constr ? constr : ctx->object_constr); if(FAILED(hres)) { heap_free(object); return hres;

1 0

Jacek Caban : jscript: Don' t expose properties that belong to function prototype from function instance .
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: 15a83f0ff50d313e45ace2d31c0676e2f6145d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15a83f0ff50d313e45ace2d31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 23 15:53:38 2012 +0200 jscript: Don't expose properties that belong to function prototype from function instance. --- dlls/jscript/function.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 1ce1124..23ce98c 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -571,6 +571,20 @@ static const builtin_info_t Function_info = { NULL }; +static const builtin_prop_t FunctionInst_props[] = { + {argumentsW, Function_arguments, 0}, + {lengthW, Function_length, 0} +}; + +static const builtin_info_t FunctionInst_info = { + JSCLASS_FUNCTION, + {NULL, Function_value, 0}, + sizeof(FunctionInst_props)/sizeof(*FunctionInst_props), + FunctionInst_props, + Function_destructor, + NULL +}; + static HRESULT create_function(script_ctx_t *ctx, const builtin_info_t *builtin_info, DWORD flags, BOOL funcprot, jsdisp_t *prototype, FunctionInstance **ret) { @@ -582,11 +596,11 @@ static HRESULT create_function(script_ctx_t *ctx, const builtin_info_t *builtin_ return E_OUTOFMEMORY; if(funcprot) - hres = init_dispex(&function->dispex, ctx, &Function_info, prototype); + hres = init_dispex(&function->dispex, ctx, builtin_info, prototype); else if(builtin_info) hres = init_dispex_from_constr(&function->dispex, ctx, builtin_info, ctx->function_constr); else - hres = init_dispex_from_constr(&function->dispex, ctx, &Function_info, ctx->function_constr); + hres = init_dispex_from_constr(&function->dispex, ctx, &FunctionInst_info, ctx->function_constr); if(FAILED(hres)) return hres; @@ -835,14 +849,14 @@ HRESULT init_function_constr(script_ctx_t *ctx, jsdisp_t *object_prototype) static const WCHAR FunctionW[] = {'F','u','n','c','t','i','o','n',0}; - hres = create_function(ctx, NULL, PROPF_CONSTR, TRUE, object_prototype, &prot); + hres = create_function(ctx, &Function_info, PROPF_CONSTR, TRUE, object_prototype, &prot); if(FAILED(hres)) return hres; prot->value_proc = FunctionProt_value; prot->name = prototypeW; - hres = create_function(ctx, NULL, PROPF_CONSTR|1, TRUE, &prot->dispex, &constr); + hres = create_function(ctx, &FunctionInst_info, PROPF_CONSTR|1, TRUE, &prot->dispex, &constr); if(SUCCEEDED(hres)) { constr->value_proc = FunctionConstr_value; constr->name = FunctionW;

1 0

Dmitry Timoshkov : windowscodecs: Add a test for invalid predefined palette type.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: 9083bcc59c48736641381dd87551c47804be5572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9083bcc59c48736641381dd87… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 23 12:49:03 2012 +0900 windowscodecs: Add a test for invalid predefined palette type. --- dlls/windowscodecs/palette.c | 4 ++-- dlls/windowscodecs/tests/palette.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 62c7907..096258a 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -403,8 +403,8 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, break; default: - FIXME("(%p,%u,%d): stub\n", iface, type, add_transparent); - return E_NOTIMPL; + WARN("invalid palette type %u\n", type); + return E_INVALIDARG; } EnterCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 5a8c808..499d59d 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -402,6 +402,16 @@ static void test_predefined_palette(void) &IID_IWICImagingFactory, (void **)&factory); ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeCustom, FALSE); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeMedianCut, FALSE); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + hr = IWICPalette_InitializePredefined(palette, 0x0f, FALSE); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + IWICPalette_Release(palette); + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { hr = IWICImagingFactory_CreatePalette(factory, &palette);

1 0

Nikolay Sivov : kernel32: Single thread test for InitOnceExecuteOnce().
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: 9318528702a62da5abf1553c4538f4be83701ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9318528702a62da5abf1553c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 22 22:59:46 2012 +0400 kernel32: Single thread test for InitOnceExecuteOnce(). --- dlls/kernel32/tests/sync.c | 58 ++++++++++++++++++++++++++++++++++++++++++- include/winbase.h | 2 + 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index ccb21bb..97139a9 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -38,6 +38,7 @@ static HANDLE (WINAPI *pOpenWaitableTimerA)(DWORD,BOOL,LPCSTR); static HANDLE (WINAPI *pCreateMemoryResourceNotification)(MEMORY_RESOURCE_NOTIFICATION_TYPE); static BOOL (WINAPI *pQueryMemoryResourceNotification)(HANDLE, PBOOL); static VOID (WINAPI *pInitOnceInitialize)(PINIT_ONCE); +static BOOL (WINAPI *pInitOnceExecuteOnce)(PINIT_ONCE,PINIT_ONCE_FN,PVOID,LPVOID*); static void test_signalandwait(void) { @@ -1136,19 +1137,71 @@ static void test_WaitForMultipleObjects(void) if (maxevents[i]) CloseHandle(maxevents[i]); } +static BOOL g_initcallback_ret, g_initcallback_called; + +BOOL CALLBACK initonce_callback(INIT_ONCE *initonce, void *parameter, void **ctxt) +{ + g_initcallback_called = TRUE; + /* zero bit set means here that initialization is taking place - initialization locked */ + ok(initonce->Ptr == (void*)0x1, "got %p\n", initonce->Ptr); + ok(parameter == (void*)0xdeadbeef, "got wrong parameter\n"); + return g_initcallback_ret; +} + static void test_initonce(void) { INIT_ONCE initonce; + void *ctxt; + BOOL ret; - if (!pInitOnceInitialize) + if (!pInitOnceInitialize || !pInitOnceExecuteOnce) { - win_skip("one-time initialization API not supported\n"); + skip("one-time initialization API not supported\n"); return; } initonce.Ptr = (void*)0xdeadbeef; pInitOnceInitialize(&initonce); ok(initonce.Ptr == NULL, "got %p\n", initonce.Ptr); + + /* initialisation completed successfully */ + g_initcallback_ret = TRUE; + ctxt = NULL; + ret = pInitOnceExecuteOnce(&initonce, &initonce_callback, (void*)0xdeadbeef, &ctxt); + ok(ret, "got wrong ret value %d\n", ret); + ok(initonce.Ptr == (void*)0x2, "got %p\n", initonce.Ptr); + ok(ctxt == (void*)0x0, "got %p\n", ctxt); + ok(g_initcallback_called, "got %d\n", g_initcallback_called); + + /* so it's been called already so won't be called again */ + ctxt = NULL; + g_initcallback_called = FALSE; + ret = pInitOnceExecuteOnce(&initonce, &initonce_callback, (void*)0xdeadbeef, &ctxt); + ok(ret, "got wrong ret value %d\n", ret); + ok(initonce.Ptr == (void*)0x2, "got %p\n", initonce.Ptr); + ok(ctxt == (void*)0, "got %p\n", ctxt); + ok(!g_initcallback_called, "got %d\n", g_initcallback_called); + + pInitOnceInitialize(&initonce); + g_initcallback_called = FALSE; + /* 2 lower order bits should never be used, you'll get a crash in result */ + ctxt = (void*)0xFFFFFFF0; + ret = pInitOnceExecuteOnce(&initonce, &initonce_callback, (void*)0xdeadbeef, &ctxt); + ok(ret, "got wrong ret value %d\n", ret); + ok(initonce.Ptr == (void*)0xFFFFFFF2, "got %p\n", initonce.Ptr); + ok(ctxt == (void*)0xFFFFFFF0, "got %p\n", ctxt); + ok(g_initcallback_called, "got %d\n", g_initcallback_called); + + /* callback failed */ + g_initcallback_ret = FALSE; + g_initcallback_called = FALSE; + ctxt = NULL; + pInitOnceInitialize(&initonce); + ret = pInitOnceExecuteOnce(&initonce, &initonce_callback, (void*)0xdeadbeef, &ctxt); + ok(!ret, "got wrong ret value %d\n", ret); + ok(initonce.Ptr == NULL, "got %p\n", initonce.Ptr); + ok(ctxt == NULL, "got %p\n", ctxt); + ok(g_initcallback_called, "got %d\n", g_initcallback_called); } START_TEST(sync) @@ -1164,6 +1217,7 @@ START_TEST(sync) pCreateMemoryResourceNotification = (void *)GetProcAddress(hdll, "CreateMemoryResourceNotification"); pQueryMemoryResourceNotification = (void *)GetProcAddress(hdll, "QueryMemoryResourceNotification"); pInitOnceInitialize = (void *)GetProcAddress(hdll, "InitOnceInitialize"); + pInitOnceExecuteOnce = (void *)GetProcAddress(hdll, "InitOnceExecuteOnce"); test_signalandwait(); test_mutex(); diff --git a/include/winbase.h b/include/winbase.h index 532dbcd..0bc5755 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1321,6 +1321,8 @@ typedef RTL_RUN_ONCE INIT_ONCE; typedef PRTL_RUN_ONCE PINIT_ONCE; typedef PRTL_RUN_ONCE LPINIT_ONCE; #define INIT_ONCE_STATIC_INIT RTL_RUN_ONCE_INIT +/* initialization callback prototype */ +typedef BOOL (WINAPI *PINIT_ONCE_FN)(PINIT_ONCE,PVOID,PVOID*); WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID);

1 0

Nikolay Sivov : kernel32: Added InitOnceInitialize() implementation.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: b1c3c8c898669a1d1c0b927a158116ce2172e5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c3c8c898669a1d1c0b927a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 22 18:33:14 2012 +0400 kernel32: Added InitOnceInitialize() implementation. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/sync.c | 18 ++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/sync.c | 5 +++++ include/winbase.h | 7 +++++++ include/winnt.h | 7 +++++++ 6 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5906ca3..a916309 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -747,6 +747,7 @@ @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) @ stdcall InitializeCriticalSectionEx(ptr long long) @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead +@ stdcall InitOnceInitialize(ptr) ntdll.RtlRunOnceInitialize @ stdcall -arch=i386 InterlockedCompareExchange (ptr long long) @ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr int64 int64) ntdll.RtlInterlockedCompareExchange64 @ stdcall -arch=i386 InterlockedDecrement(ptr) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 4068b22..ccb21bb 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -37,6 +37,7 @@ static BOOL (WINAPI *pDeleteTimerQueueTimer)(HANDLE, HANDLE, HANDLE); static HANDLE (WINAPI *pOpenWaitableTimerA)(DWORD,BOOL,LPCSTR); static HANDLE (WINAPI *pCreateMemoryResourceNotification)(MEMORY_RESOURCE_NOTIFICATION_TYPE); static BOOL (WINAPI *pQueryMemoryResourceNotification)(HANDLE, PBOOL); +static VOID (WINAPI *pInitOnceInitialize)(PINIT_ONCE); static void test_signalandwait(void) { @@ -1135,6 +1136,21 @@ static void test_WaitForMultipleObjects(void) if (maxevents[i]) CloseHandle(maxevents[i]); } +static void test_initonce(void) +{ + INIT_ONCE initonce; + + if (!pInitOnceInitialize) + { + win_skip("one-time initialization API not supported\n"); + return; + } + + initonce.Ptr = (void*)0xdeadbeef; + pInitOnceInitialize(&initonce); + ok(initonce.Ptr == NULL, "got %p\n", initonce.Ptr); +} + START_TEST(sync) { HMODULE hdll = GetModuleHandle("kernel32"); @@ -1147,6 +1163,7 @@ START_TEST(sync) pOpenWaitableTimerA = (void*)GetProcAddress(hdll, "OpenWaitableTimerA"); pCreateMemoryResourceNotification = (void *)GetProcAddress(hdll, "CreateMemoryResourceNotification"); pQueryMemoryResourceNotification = (void *)GetProcAddress(hdll, "QueryMemoryResourceNotification"); + pInitOnceInitialize = (void *)GetProcAddress(hdll, "InitOnceInitialize"); test_signalandwait(); test_mutex(); @@ -1158,4 +1175,5 @@ START_TEST(sync) test_timer_queue(); test_WaitForSingleObject(); test_WaitForMultipleObjects(); + test_initonce(); } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8de353f..4ace865 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -815,6 +815,7 @@ @ stub RtlRevertMemoryStream @ stub RtlRunDecodeUnicodeString @ stub RtlRunEncodeUnicodeString +@ stdcall RtlRunOnceInitialize(ptr) @ stdcall RtlSecondsSince1970ToTime(long ptr) @ stdcall RtlSecondsSince1980ToTime(long ptr) # @ stub RtlSeekMemoryStream diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index f759ce6..09151a9 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1463,3 +1463,8 @@ NTSTATUS NTDLL_AddCompletion( HANDLE hFile, ULONG_PTR CompletionValue, SERVER_END_REQ; return status; } + +VOID NTAPI RtlRunOnceInitialize(PRTL_RUN_ONCE initonce) +{ + initonce->Ptr = NULL; +} diff --git a/include/winbase.h b/include/winbase.h index 8b5805c..532dbcd 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1316,6 +1316,12 @@ typedef struct _WIN32_STREAM_ID { #define LOGON_NETCREDENTIALS_ONLY 0x00000002 #define LOGON_ZERO_PASSWORD_BUFFER 0x80000000 +/* one-time initialisation API */ +typedef RTL_RUN_ONCE INIT_ONCE; +typedef PRTL_RUN_ONCE PINIT_ONCE; +typedef PRTL_RUN_ONCE LPINIT_ONCE; +#define INIT_ONCE_STATIC_INIT RTL_RUN_ONCE_INIT + WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); @@ -1876,6 +1882,7 @@ WINADVAPI BOOL WINAPI InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR, WINADVAPI BOOL WINAPI InitializeSid(PSID,PSID_IDENTIFIER_AUTHORITY,BYTE); WINBASEAPI VOID WINAPI InitializeSListHead(PSLIST_HEADER); WINBASEAPI VOID WINAPI InitializeSRWLock(PSRWLOCK); +WINBASEAPI VOID WINAPI InitOnceInitialize(PINIT_ONCE); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ENTRY); diff --git a/include/winnt.h b/include/winnt.h index 16cc4e9..d65e2f6 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5087,6 +5087,13 @@ typedef struct _RTL_SRWLOCK { typedef VOID (NTAPI * WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN ); typedef VOID (NTAPI * PFLS_CALLBACK_FUNCTION) ( PVOID ); +#define RTL_RUN_ONCE_INIT {0} +typedef union _RTL_RUN_ONCE { + PVOID Ptr; +} RTL_RUN_ONCE, *PRTL_RUN_ONCE; + +NTSYSAPI VOID NTAPI RtlRunOnceInitialize(PRTL_RUN_ONCE); + #include <pshpack8.h> typedef struct _IO_COUNTERS { ULONGLONG DECLSPEC_ALIGN(8) ReadOperationCount;

1 0

Alexandre Julliard : include: Fix alignment of cabinet structures on 64-bit .
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: 6576986e37ba0efe4f5562b334169a8203d19af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6576986e37ba0efe4f5562b33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 23 12:47:57 2012 +0200 include: Fix alignment of cabinet structures on 64-bit. --- include/fci.h | 4 ++++ include/fdi.h | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/fci.h b/include/fci.h index 6e1899d..da736bd 100644 --- a/include/fci.h +++ b/include/fci.h @@ -25,7 +25,9 @@ extern "C" { #endif /* defined(__cplusplus) */ +#ifndef _WIN64 #include <pshpack4.h> +#endif #ifndef INCLUDED_TYPES_FCI_FDI #define INCLUDED_TYPES_FCI_FDI 1 @@ -250,7 +252,9 @@ BOOL __cdecl FCIDestroy(HFCI hfci); /**********************************************************************/ +#ifndef _WIN64 #include <poppack.h> +#endif #ifdef __cplusplus } /* extern "C" */ diff --git a/include/fdi.h b/include/fdi.h index f36baaf..2044c59 100644 --- a/include/fdi.h +++ b/include/fdi.h @@ -25,7 +25,9 @@ extern "C" { #endif /* defined(__cplusplus) */ +#ifndef _WIN64 #include <pshpack4.h> +#endif #ifndef INCLUDED_TYPES_FCI_FDI #define INCLUDED_TYPES_FCI_FDI 1 @@ -259,14 +261,18 @@ typedef INT_PTR (__cdecl *PFNFDINOTIFY)(FDINOTIFICATIONTYPE fdint, #define FNFDINOTIFY(fn) INT_PTR __cdecl fn(FDINOTIFICATIONTYPE fdint, \ PFDINOTIFICATION pfdin) +#ifndef _WIN64 #include <pshpack1.h> +#endif typedef struct { char ach[2]; /* Set to { '*', '\0' } */ LONG cbFile; /* Required spill file size */ } FDISPILLFILE, *PFDISPILLFILE; +#ifndef _WIN64 #include <poppack.h> +#endif #define cpuUNKNOWN (-1) /* FDI does detection */ #define cpu80286 (0) /* '286 opcodes only */ @@ -284,7 +290,9 @@ BOOL __cdecl FDITruncateCabinet(HFDI, char *, USHORT); /**********************************************************************/ +#ifndef _WIN64 #include <poppack.h> +#endif #ifdef __cplusplus } /* extern "C" */

1 0

Nikolay Sivov : kernel32: Forward GetLocaleInfoEx() to GetLocaleInfoW().
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: 77ad893a7bb9797fb81a236cc3f915b5a86da4e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ad893a7bb9797fb81a236cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 22 11:43:08 2012 +0400 kernel32: Forward GetLocaleInfoEx() to GetLocaleInfoW(). --- dlls/kernel32/locale.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index ac708c3..0afe89d 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1416,14 +1416,10 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LCTYPE lctype, LPWSTR buffer, INT len ) /****************************************************************************** * GetLocaleInfoEx (KERNEL32.@) - * - * FIXME: Should probably be a wrapper around GetLocaleInfo() (or vice-versa). */ INT WINAPI GetLocaleInfoEx(LPCWSTR locale, LCTYPE info, LPWSTR buffer, INT len) { - FIXME("(locale=%s,info=0x%x,%p,%d): stub!\n", debugstr_w(locale), info, buffer, len); - SetLastError(ERROR_INVALID_PARAMETER); - return 0; + return GetLocaleInfoW(LocaleNameToLCID(locale, 0), info, buffer, len); } /******************************************************************************

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone125 palette.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: 97464c508fec781f2aa4ecfbdc8f88d55008f6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97464c508fec781f2aa4ecfbd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 23 12:44:54 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone125 palette. --- dlls/windowscodecs/palette.c | 27 +++++++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 21 +++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 74438f6..a4124a7 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -210,6 +210,28 @@ static WICColor *generate_halftone64_palette(UINT *count) return entries; } +static WICColor *generate_halftone125_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 126; + entries = HeapAlloc(GetProcessHeap(), 0, 126 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 125; i++) + { + static const BYTE halftone_values[5] = { 0x00,0x40,0x80,0xbf,0xff }; + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%5]; + entries[i] |= halftone_values[(i/5)%5] << 8; + entries[i] |= halftone_values[(i/25)%5] << 16; + } + + entries[i] = 0xffc0c0c0; + return entries; +} + static WICColor *generate_halftone256_palette(UINT *count) { WICColor *entries; @@ -285,6 +307,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedHalftone125: + colors = generate_halftone125_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + case WICBitmapPaletteTypeFixedHalftone256: colors = generate_halftone256_palette(&count); if (!colors) return E_OUTOFMEMORY; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 7c4c3d4..32dbfc9 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -241,6 +241,24 @@ static void generate_halftone64_palette(DWORD *entries, UINT count) } } +static void generate_halftone125_palette(DWORD *entries, UINT count) +{ + static const BYTE halftone_values[5] = { 0x00,0x40,0x80,0xbf,0xff }; + UINT i; + + assert(count == 126); + + for (i = 0; i < 125; i++) + { + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%5]; + entries[i] |= halftone_values[(i/5)%5] << 8; + entries[i] |= halftone_values[(i/25)%5] << 16; + } + + entries[i] = 0xffc0c0c0; +} + static void generate_halftone256_palette(DWORD *entries, UINT count) { static const BYTE halftone_values_b[4] = { 0x00,0x55,0xaa,0xff }; @@ -276,6 +294,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedHalftone8, 0, 0, 16, { 0 } }, { WICBitmapPaletteTypeFixedHalftone27, 0, 0, 28, { 0 } }, { WICBitmapPaletteTypeFixedHalftone64, 0, 0, 72, { 0 } }, + { WICBitmapPaletteTypeFixedHalftone125, 0, 0, 126, { 0 } }, { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 } }, }; IWICImagingFactory *factory; @@ -337,6 +356,8 @@ static void test_predefined_palette(void) generate_halftone27_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone64) generate_halftone64_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedHalftone125) + generate_halftone125_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone256) generate_halftone256_palette(td[i].color, td[i].count);

1 0