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

Henri Verbeet : wined3d: Clear reg_maps in shader_get_registers_used() instead of the callers.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: 9db67a59712d4b8cdce52b022d2b7926e25b6198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db67a59712d4b8cdce52b022… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 09:53:29 2009 +0200 wined3d: Clear reg_maps in shader_get_registers_used() instead of the callers. --- dlls/wined3d/baseshader.c | 3 +-- dlls/wined3d/pixelshader.c | 1 - dlls/wined3d/vertexshader.c | 1 - 3 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index d565fb3..fb5effc 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -556,8 +556,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m /* There are some minor differences between pixel and vertex shaders */ - memset(reg_maps->bumpmat, 0, sizeof(reg_maps->bumpmat)); - memset(reg_maps->luminanceparams, 0, sizeof(reg_maps->luminanceparams)); + memset(reg_maps, 0, sizeof(*reg_maps)); /* get_registers_used is called on every compile on some 1.x shaders, which can result * in stacking up a collection of local constants. Delete the old constants if existing diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 0b1aa1d..04b5c61 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -314,7 +314,6 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i list_init(&This->baseShader.constantsI); /* Second pass: figure out which registers are used, what the semantics are, etc.. */ - memset(reg_maps, 0, sizeof(shader_reg_maps)); hr = shader_get_registers_used((IWineD3DBaseShader *)This, reg_maps, This->semantics_in, NULL, pFunction); if (FAILED(hr)) return hr; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 6d4dc24..b373caa 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -329,7 +329,6 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader /* Second pass: figure out registers used, semantics, etc.. */ This->min_rel_offset = GL_LIMITS(vshader_constantsF); This->max_rel_offset = 0; - memset(reg_maps, 0, sizeof(shader_reg_maps)); hr = shader_get_registers_used((IWineD3DBaseShader*) This, reg_maps, This->semantics_in, This->semantics_out, pFunction); if (hr != WINED3D_OK) return hr;

1 0

Eric Pouech : kernel32: In editline's keys table, use constants instead of numeric constants.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: 88bdc0c1107323046415865e5f72206bef9cac30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88bdc0c1107323046415865e5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 27 21:09:06 2009 +0200 kernel32: In editline's keys table, use constants instead of numeric constants. --- dlls/kernel32/editline.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 6fab049..bcbf927 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -727,13 +727,13 @@ static const KeyEntry EmacsKeyMapExtended[] = static const KeyMap EmacsKeyMap[] = { - {0x00000000, 1, StdKeyMap}, - {0x00000001, 1, EmacsKeyMapAlt}, /* left alt */ - {0x00000002, 1, EmacsKeyMapAlt}, /* right alt */ - {0x00000004, 1, EmacsKeyMapCtrl}, /* left ctrl */ - {0x00000008, 1, EmacsKeyMapCtrl}, /* right ctrl */ - {0x00000100, 0, EmacsKeyMapExtended}, - {0, 0, 0} + {0, 1, StdKeyMap}, + {RIGHT_ALT_PRESSED, 1, EmacsKeyMapAlt}, /* right alt */ + {LEFT_ALT_PRESSED, 1, EmacsKeyMapAlt}, /* left alt */ + {RIGHT_CTRL_PRESSED, 1, EmacsKeyMapCtrl}, /* right ctrl */ + {LEFT_CTRL_PRESSED, 1, EmacsKeyMapCtrl}, /* left ctrl */ + {ENHANCED_KEY, 0, EmacsKeyMapExtended}, + {0, 0, NULL} }; static const KeyEntry Win32KeyMapExtended[] = @@ -758,12 +758,12 @@ static const KeyEntry Win32KeyMapCtrlExtended[] = static const KeyMap Win32KeyMap[] = { - {0x00000000, 1, StdKeyMap}, - {0x00000000, 0, Win32ExtraStdKeyMap}, - {0x00000100, 0, Win32KeyMapExtended}, - {0x00000104, 0, Win32KeyMapCtrlExtended}, - {0x00000108, 0, Win32KeyMapCtrlExtended}, - {0, 0, 0} + {0, 1, StdKeyMap}, + {0, 0, Win32ExtraStdKeyMap}, + {ENHANCED_KEY, 0, Win32KeyMapExtended}, + {ENHANCED_KEY | RIGHT_CTRL_PRESSED, 0, Win32KeyMapCtrlExtended}, + {ENHANCED_KEY | LEFT_CTRL_PRESSED, 0, Win32KeyMapCtrlExtended}, + {0, 0, NULL} }; #undef CTRL

1 0

André Hentschel : cmdlgtst: Spelling fix.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: 078d465fa9c01d96b6b700ca9178f0d68055e4fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=078d465fa9c01d96b6b700ca9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 27 20:34:16 2009 +0200 cmdlgtst: Spelling fix. --- programs/cmdlgtst/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmdlgtst/De.rc b/programs/cmdlgtst/De.rc index 323b6f8..f8e7d0e 100644 --- a/programs/cmdlgtst/De.rc +++ b/programs/cmdlgtst/De.rc @@ -145,7 +145,7 @@ FONT 8, "MS Shell Dlg" CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 168, 11, 13 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 180, 11, 13 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 24, 228, 11, 13 - CONTROL "Markierte Flags sind durch das System gesetzt wurden und m�ssen von dem Benutzer entfernt werden", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36 + CONTROL "Markierte Flags sind durch das System gesetzt worden und m�ssen von dem Benutzer entfernt werden", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36 } Print_Flags_Dialog DIALOG 4, 17, 239, 287

1 0

Henri Verbeet : wined3d: Mask set bool/int constants with bool/ int constants read.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: b8b12d2dc287f092f4ada1e6bc1e4ea46deaa029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8b12d2dc287f092f4ada1e6b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 09:53:29 2009 +0200 wined3d: Mask set bool/int constants with bool/int constants read. --- dlls/wined3d/glsl_shader.c | 28 ++++++++-------------------- 1 files changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 329ae94..a1bded3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -558,18 +558,12 @@ static void shader_glsl_load_constants( prog->vuniformF_locations, &priv->vconst_heap, priv->stack, constant_version); /* Load DirectX 9 integer constants/uniforms for vertex shader */ - if (vshader->baseShader.reg_maps.integer_constants) - { - shader_glsl_load_constantsI(vshader, gl_info, prog->vuniformI_locations, - stateBlock->vertexShaderConstantI, stateBlock->changed.vertexShaderConstantsI); - } + shader_glsl_load_constantsI(vshader, gl_info, prog->vuniformI_locations, stateBlock->vertexShaderConstantI, + stateBlock->changed.vertexShaderConstantsI & vshader->baseShader.reg_maps.integer_constants); /* Load DirectX 9 boolean constants/uniforms for vertex shader */ - if (vshader->baseShader.reg_maps.boolean_constants) - { - shader_glsl_load_constantsB(vshader, gl_info, programId, - stateBlock->vertexShaderConstantB, stateBlock->changed.vertexShaderConstantsB); - } + shader_glsl_load_constantsB(vshader, gl_info, programId, stateBlock->vertexShaderConstantB, + stateBlock->changed.vertexShaderConstantsB & vshader->baseShader.reg_maps.boolean_constants); /* Upload the position fixup params */ GL_EXTCALL(glUniform4fvARB(prog->posFixup_location, 1, &deviceImpl->posFixup[0])); @@ -585,18 +579,12 @@ static void shader_glsl_load_constants( prog->puniformF_locations, &priv->pconst_heap, priv->stack, constant_version); /* Load DirectX 9 integer constants/uniforms for pixel shader */ - if (pshader->baseShader.reg_maps.integer_constants) - { - shader_glsl_load_constantsI(pshader, gl_info, prog->puniformI_locations, - stateBlock->pixelShaderConstantI, stateBlock->changed.pixelShaderConstantsI); - } + shader_glsl_load_constantsI(pshader, gl_info, prog->puniformI_locations, stateBlock->pixelShaderConstantI, + stateBlock->changed.pixelShaderConstantsI & pshader->baseShader.reg_maps.integer_constants); /* Load DirectX 9 boolean constants/uniforms for pixel shader */ - if (pshader->baseShader.reg_maps.boolean_constants) - { - shader_glsl_load_constantsB(pshader, gl_info, programId, - stateBlock->pixelShaderConstantB, stateBlock->changed.pixelShaderConstantsB); - } + shader_glsl_load_constantsB(pshader, gl_info, programId, stateBlock->pixelShaderConstantB, + stateBlock->changed.pixelShaderConstantsB & pshader->baseShader.reg_maps.boolean_constants); /* Upload the environment bump map matrix if needed. The needsbumpmat member specifies the texture stage to load the matrix from. * It can't be 0 for a valid texbem instruction.

1 0

Austin English : notepad: Don't append seconds to time format.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: 2c3497b9082f5226140003a01ab0bcf696e0ad8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c3497b9082f5226140003a01… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 27 18:39:49 2009 -0500 notepad: Don't append seconds to time format. --- programs/notepad/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index aa0a53c..0abbc33 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -654,7 +654,7 @@ VOID DIALOG_EditTimeDate(VOID) GetLocalTime(&st); - GetTimeFormat(LOCALE_USER_DEFAULT, 0, &st, NULL, szDate, MAX_STRING_LEN); + GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &st, NULL, szDate, MAX_STRING_LEN); SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)spaceW);

1 0

Paul Vriens : urlmon/tests: Fix a test failure on Win9x, WinME and NT4.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: 6ba4b314f36705d6ea73f59ff4d80ad254be53ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ba4b314f36705d6ea73f59ff… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Apr 27 20:33:12 2009 +0200 urlmon/tests: Fix a test failure on Win9x, WinME and NT4. --- dlls/urlmon/tests/protocol.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index ea19c77..e136d4b 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -671,7 +671,9 @@ static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HR if(SUCCEEDED(hrResult) || tested_protocol == FTP_TEST) ok(dwError == ERROR_SUCCESS, "dwError = %d, expected ERROR_SUCCESS\n", dwError); else - ok(dwError != ERROR_SUCCESS, "dwError == ERROR_SUCCESS\n"); + ok(dwError != ERROR_SUCCESS || + broken(tested_protocol == MK_TEST), /* Win9x, WinME and NT4 */ + "dwError == ERROR_SUCCESS\n"); ok(!szResult, "szResult != NULL\n"); return S_OK;

1 0

Paul Vriens : gdi32/tests: Fix a test failure on NT4.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: f043f3db27089f2da5f676abe016fbdeeebdd20a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f043f3db27089f2da5f676abe… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Apr 27 19:48:17 2009 +0200 gdi32/tests: Fix a test failure on NT4. --- dlls/gdi32/tests/font.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index c10d6e8..88e1797 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1785,7 +1785,9 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) ok(efdw.total > 0, "fonts enumerated: NULL\n"); ok(ansi_charset > 0, "NULL family should enumerate ANSI_CHARSET\n"); ok(symbol_charset > 0, "NULL family should enumerate SYMBOL_CHARSET\n"); - ok(russian_charset > 0, "NULL family should enumerate RUSSIAN_CHARSET\n"); + ok(russian_charset > 0 || + broken(russian_charset == 0), /* NT4 */ + "NULL family should enumerate RUSSIAN_CHARSET\n"); } efdw.total = 0;

1 0

Paul Vriens : ws2_32/tests: Run tests again on several platforms due to missing functions.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: ffd855d21422325cea240a66d6e35da4d98558a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd855d21422325cea240a66d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Apr 27 16:47:49 2009 +0200 ws2_32/tests: Run tests again on several platforms due to missing functions. --- dlls/ws2_32/tests/sock.c | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8316982..e7c9868 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -56,7 +56,8 @@ } while (0); /* Function pointers */ -static HMODULE hws2_32 = 0; +static void (WINAPI *pFreeAddrInfoW)(PADDRINFOW) = 0; +static int (WINAPI *pGetAddrInfoW)(LPCWSTR,LPCWSTR,const ADDRINFOW *,PADDRINFOW *) = 0; static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG) = 0; /**************** Structs and typedefs ***************/ @@ -841,6 +842,11 @@ static void Init (void) { WORD ver = MAKEWORD (2, 2); WSADATA data; + HMODULE hws2_32 = GetModuleHandle("ws2_32.dll"); + + pFreeAddrInfoW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoW"); + pGetAddrInfoW = (void *)GetProcAddress(hws2_32, "GetAddrInfoW"); + pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); ok ( WSAStartup ( ver, &data ) == 0, "WSAStartup failed\n" ); tls = TlsAlloc(); @@ -2016,9 +2022,6 @@ static void test_addr_to_print(void) u_char addr3_Num[16] = {0x20,0x30,0xa4,0xb1}; PCSTR addr3_Str = "2030:a4b1::"; - hws2_32 = GetModuleHandle("ws2_32.dll"); - pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); - in.s_addr = addr0_Num; pdst = inet_ntoa(*((struct in_addr*)&in.s_addr)); @@ -2382,22 +2385,28 @@ static void test_GetAddrInfoW(void) int ret; ADDRINFOW *result, hint; + if (!pGetAddrInfoW || !pFreeAddrInfoW) + { + win_skip("GetAddrInfoW and/or FreeAddrInfoW not present\n"); + return; + } + memset(&hint, 0, sizeof(ADDRINFOW)); - ret = GetAddrInfoW(NULL, NULL, NULL, &result); + ret = pGetAddrInfoW(NULL, NULL, NULL, &result); ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); - ret = GetAddrInfoW(localhost, NULL, NULL, &result); + ret = pGetAddrInfoW(localhost, NULL, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); - FreeAddrInfoW(result); + pFreeAddrInfoW(result); - ret = GetAddrInfoW(localhost, port, NULL, &result); + ret = pGetAddrInfoW(localhost, port, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); - FreeAddrInfoW(result); + pFreeAddrInfoW(result); - ret = GetAddrInfoW(localhost, port, &hint, &result); + ret = pGetAddrInfoW(localhost, port, &hint, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); - FreeAddrInfoW(result); + pFreeAddrInfoW(result); } /**************** Main program ***************/

1 0

Alexandre Julliard : wininet: Fix a memory leak in the URL cache.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: 7e11ecdd8d2db70526f284c43bf7a7f1ebd14a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e11ecdd8d2db70526f284c43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 20:04:45 2009 +0200 wininet: Fix a memory leak in the URL cache. --- dlls/wininet/urlcache.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index b4feba3..5e1541d 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -692,6 +692,7 @@ static LPURLCACHE_HEADER URLCacheContainer_LockIndex(URLCACHECONTAINER * pContai * of the memory mapped file */ if (pHeader->dwFileSize != pContainer->file_size) { + UnmapViewOfFile( pHeader ); URLCacheContainer_CloseIndex(pContainer); error = URLCacheContainer_OpenIndex(pContainer); if (error != ERROR_SUCCESS)

1 0

Alexandre Julliard : wininet: Add stubs for PrivacyGet/SetZonePreferenceW.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: e12ade9fb39fd0d9b78c052496f301b8bfe446a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e12ade9fb39fd0d9b78c05249… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 20:04:34 2009 +0200 wininet: Add stubs for PrivacyGet/SetZonePreferenceW. --- dlls/wininet/internet.c | 19 +++++++++++++++++++ dlls/wininet/wininet.spec | 4 ++-- include/wininet.h | 17 +++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 785a1ef..4bb25e7 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3815,6 +3815,25 @@ DWORD WINAPI InternetConfirmZoneCrossingW( HWND hWnd, LPWSTR szUrlPrev, LPWSTR s return ERROR_SUCCESS; } +/*********************************************************************** + * PrivacySetZonePreferenceW (WININET.@) + */ +DWORD WINAPI PrivacySetZonePreferenceW( DWORD zone, DWORD type, DWORD template, LPCWSTR preference ) +{ + FIXME( "%x %x %x %s: stub\n", zone, type, template, debugstr_w(preference) ); + return 0; +} + +/*********************************************************************** + * PrivacyGetZonePreferenceW (WININET.@) + */ +DWORD WINAPI PrivacyGetZonePreferenceW( DWORD zone, DWORD type, LPDWORD template, + LPWSTR preference, LPDWORD length ) +{ + FIXME( "%x %x: stub\n", zone, type ); + return 0; +} + DWORD WINAPI InternetDialA( HWND hwndParent, LPSTR lpszConnectoid, DWORD dwFlags, DWORD_PTR* lpdwConnection, DWORD dwReserved ) { diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 78b98cc..61beaf4 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -213,8 +213,8 @@ @ stdcall IsUrlCacheEntryExpiredW(wstr long ptr) @ stub LoadUrlCacheContent @ stub ParseX509EncodedCertificateForListBoxEntry -@ stub PrivacyGetZonePreferenceW # (long long ptr ptr ptr) -@ stub PrivacySetZonePreferenceW # (long long long wstr) +@ stdcall PrivacyGetZonePreferenceW(long long ptr ptr ptr) +@ stdcall PrivacySetZonePreferenceW(long long long wstr) @ stdcall ReadUrlCacheEntryStream(ptr long ptr ptr long) @ stdcall RegisterUrlCacheNotification(ptr long long long long long) @ stdcall ResumeSuspendedDownload(long long) diff --git a/include/wininet.h b/include/wininet.h index d3263fe..6ce8ae0 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1356,6 +1356,23 @@ INTERNETAPI DWORD WINAPI InternetConfirmZoneCrossingA(HWND ,LPSTR ,LPSTR ,BOOL); INTERNETAPI DWORD WINAPI InternetConfirmZoneCrossingW(HWND ,LPWSTR ,LPWSTR ,BOOL); #define InternetConfirmZoneCrossing WINELIB_NAME_AW(InternetConfirmZoneCrossing) +#define PRIVACY_TEMPLATE_NO_COOKIES 0 +#define PRIVACY_TEMPLATE_HIGH 1 +#define PRIVACY_TEMPLATE_MEDIUM_HIGH 2 +#define PRIVACY_TEMPLATE_MEDIUM 3 +#define PRIVACY_TEMPLATE_MEDIUM_LOW 4 +#define PRIVACY_TEMPLATE_LOW 5 +#define PRIVACY_TEMPLATE_CUSTOM 100 +#define PRIVACY_TEMPLATE_ADVANCED 101 + +#define PRIVACY_TEMPLATE_MAX PRIVACY_TEMPLATE_LOW + +#define PRIVACY_TYPE_FIRST_PARTY 0 +#define PRIVACY_TYPE_THIRD_PARTY 1 + +INTERNETAPI DWORD WINAPI PrivacySetZonePreferenceW(DWORD,DWORD,DWORD,LPCWSTR); +INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LPDWORD); + #define INTERNET_ERROR_BASE 12000 #define ERROR_INTERNET_OUT_OF_HANDLES (INTERNET_ERROR_BASE + 1)

1 0