wine-commits December 2008

wine-commits@winehq.org

2 participants
1225 discussions

Stefan Dösinger : wined3d: Give ATIFS a pixel shader handler.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: c93727826222bd5ea99226e6cd8d36ac5ef71a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c93727826222bd5ea99226e6c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 13 20:07:16 2008 +0100 wined3d: Give ATIFS a pixel shader handler. --- dlls/wined3d/ati_fragment_shader.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 1933476..b4c5334 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -881,6 +881,30 @@ static void textransform(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3 } } +static void atifs_apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; + BOOL use_vshader = use_vs(device); + + /* The ATIFS code does not support pixel shaders currently, but we have to provide a state handler + * to call shader_select to select a vertex shader if one is applied because the vertex shader state + * may defer calling the shader backend if the pshader state is dirty. + * + * In theory the application should not be able to mark the pixel shader dirty because it cannot + * create a shader, and thus has no way to set the state to something != NULL. However, a different + * pipeline part may link a different state to its pixelshader handler, thus a pshader state exists + * and can be dirtified. Also the pshader is always dirtified at startup, and blitting disables all + * shaders and dirtifies all shader states. If atifs can deal with this it keeps the rest of the code + * simpler. + */ + if(!isStateDirty(context, device->StateTable[STATE_VSHADER].representative)) { + device->shader_backend->shader_select((IWineD3DDevice *)stateblock->wineD3DDevice, FALSE, use_vshader); + + if (!isStateDirty(context, STATE_VERTEXSHADERCONSTANT) && use_vshader) { + device->StateTable[STATE_VERTEXSHADERCONSTANT].apply(STATE_VERTEXSHADERCONSTANT, stateblock, context); + } + } +} + #undef GLINFO_LOCATION static const struct StateEntryTemplate atifs_fragmentstate_template[] = { @@ -1005,6 +1029,7 @@ static const struct StateEntryTemplate atifs_fragmentstate_template[] = { {STATE_TEXTURESTAGE(5,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(5, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, {STATE_TEXTURESTAGE(6,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(6, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, {STATE_TEXTURESTAGE(7,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(7, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, + {STATE_PIXELSHADER, { STATE_PIXELSHADER, atifs_apply_pixelshader }, 0 }, {0 /* Terminate */, { 0, 0 }, 0 }, };

1 0

Mikołaj Zalewski : devenum: Italian, Spanish, Dutch and VERSIONINFO should use SUBLANG_NEUTRAL.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: b4467c73515d0070ea6fee1231e12eaf6f791b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4467c73515d0070ea6fee123… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Dec 13 16:21:15 2008 +0100 devenum: Italian, Spanish, Dutch and VERSIONINFO should use SUBLANG_NEUTRAL. --- dlls/devenum/devenum.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index 7aa6c50..4178c37 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -24,7 +24,7 @@ #include "winbase.h" #include "winnls.h" -LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILEDESCRIPTION_STR "Wine Device Enumerator Library" #define WINE_FILENAME_STR "devenum.dll" @@ -63,7 +63,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL } STRINGTABLE DISCARDABLE -LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL { 7 "DirectSound di Default" 8 "DirectSound: %s" @@ -81,7 +81,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT } STRINGTABLE DISCARDABLE -LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL { 7 "DirectSound por defecto" 8 "DirectSound: %s" @@ -117,7 +117,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL } STRINGTABLE DISCARDABLE -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL { 7 "Standaard DirectSound" 8 "DirectSound: %s"

1 0

Jeremy Newman : fix broken xml
by Jeremy Newman 12 Dec '08

12 Dec '08

Module: website Branch: master Commit: accb7bd980773821334b4679b72be80d05493cf8 URL: http://source.winehq.org/git/website.git/?a=commit;h=accb7bd980773821334b46… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Dec 12 14:19:38 2008 -0600 fix broken xml --- wwn/en/interviews/interview_13.xml | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/wwn/en/interviews/interview_13.xml b/wwn/en/interviews/interview_13.xml index 6a7680c..1d4bce8 100644 --- a/wwn/en/interviews/interview_13.xml +++ b/wwn/en/interviews/interview_13.xml @@ -7,8 +7,7 @@ for 2004. Check out the <a href="http://www.winehq.org/interview">Interviews</a> page for previous ones. - - Pop quiz: which Wine developer lives in + Pop quiz: which Wine developer lives in <a href="http://www.dur.ac.uk/Law/c_tour/castle.html">a castle</a>? If you guessed Mike Hearn you'd be correct. Mike is studying at the University of Durham and claims to be "a pretty average

1 0

Aric Stewart : user32: Proper handling of WM_INPUTLANGCHANGEREQUEST.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: bd25af9dba280e3d80f3080140f2f5ab2cd0dfb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd25af9dba280e3d80f308014… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 11 11:30:20 2008 -0600 user32: Proper handling of WM_INPUTLANGCHANGEREQUEST. --- dlls/user32/defwnd.c | 20 ++++---------------- 1 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 8a2d21e..c4951df 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -759,6 +759,10 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa break; } + case WM_INPUTLANGCHANGEREQUEST: + ActivateKeyboardLayout( (HKL)lParam, 0 ); + break; + case WM_INPUTLANGCHANGE: { int count = 0; @@ -899,14 +903,6 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam } break; - case WM_INPUTLANGCHANGEREQUEST: - /* notify about the switch only if it's really our current layout */ - if ((HKL)lParam == GetKeyboardLayout(0)) - result = SendMessageA( hwnd, WM_INPUTLANGCHANGE, wParam, lParam ); - else - result = 0; - break; - case WM_SYSCHAR: { CHAR ch = LOWORD(wParam); @@ -1051,14 +1047,6 @@ LRESULT WINAPI DefWindowProcW( } break; - case WM_INPUTLANGCHANGEREQUEST: - /* notify about the switch only if it's really our current layout */ - if ((HKL)lParam == GetKeyboardLayout(0)) - result = SendMessageW( hwnd, WM_INPUTLANGCHANGE, wParam, lParam ); - else - result = 0; - break; - default: result = DEFWND_DefWinProc( hwnd, msg, wParam, lParam ); break;

1 0

Alexander Morozov : hal: Add missing WINAPI.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: 7443e7ded79d55f73925150ba73eeecdc8da9c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7443e7ded79d55f73925150ba… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Dec 12 13:16:17 2008 +0300 hal: Add missing WINAPI. --- dlls/hal/hal.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 5fce05e..82ba80c 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -55,9 +55,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ExAcquireFastMutex ) -VOID __regs_ExAcquireFastMutex(PFAST_MUTEX FastMutex) +VOID WINAPI __regs_ExAcquireFastMutex(PFAST_MUTEX FastMutex) #else -VOID ExAcquireFastMutex(PFAST_MUTEX FastMutex) +VOID WINAPI ExAcquireFastMutex(PFAST_MUTEX FastMutex) #endif { FIXME("%p: stub\n", FastMutex); @@ -65,9 +65,9 @@ VOID ExAcquireFastMutex(PFAST_MUTEX FastMutex) #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ExReleaseFastMutex ) -VOID __regs_ExReleaseFastMutex(PFAST_MUTEX FastMutex) +VOID WINAPI __regs_ExReleaseFastMutex(PFAST_MUTEX FastMutex) #else -VOID ExReleaseFastMutex(PFAST_MUTEX FastMutex) +VOID WINAPI ExReleaseFastMutex(PFAST_MUTEX FastMutex) #endif { FIXME("%p: stub\n", FastMutex);

1 0

Alexandre Julliard : winegcc: Fix the file mode check.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: f12e9a026b7170ef6f77f57accd1589141bd5658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12e9a026b7170ef6f77f57ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 12 12:01:46 2008 +0100 winegcc: Fix the file mode check. --- tools/winegcc/utils.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 225062d..f30a8c3 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -307,13 +307,10 @@ void spawn(const strarray* prefix, const strarray* args, int ignore_errors) if (!(p = strrchr(argv[0], '/'))) p = argv[0]; free( prog ); prog = strmake("%s/%s", prefix->base[i], p); - if (stat(prog, &st) == 0) + if (stat(prog, &st) == 0 && S_ISREG(st.st_mode) && (st.st_mode & 0111)) { - if ((st.st_mode & S_IFREG) && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) - { - argv[0] = prog; - break; - } + argv[0] = prog; + break; } } }

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLScriptElement get/put Defer .
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: de5bbbc2ff13e4b4a99bc14ebf228cbd4362351c URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5bbbc2ff13e4b4a99bc14eb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 12 20:14:17 2008 +1100 mshtml: Implement IHTMLScriptElement get/put Defer. --- dlls/mshtml/htmlscript.c | 33 +++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 24 ++++++++++++++++++++---- 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 965619e..8953b09 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -154,15 +154,40 @@ static HRESULT WINAPI HTMLScriptElement_get_text(IHTMLScriptElement *iface, BSTR static HRESULT WINAPI HTMLScriptElement_put_defer(IHTMLScriptElement *iface, VARIANT_BOOL v) { HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + HRESULT hr = S_OK; + nsresult nsres; + + TRACE("(%p)->(%x)\n", This, v); + + nsres = nsIDOMHTMLScriptElement_SetDefer(This->nsscript, v != VARIANT_FALSE); + if(NS_FAILED(nsres)) + { + hr = E_FAIL; + } + + return hr; } static HRESULT WINAPI HTMLScriptElement_get_defer(IHTMLScriptElement *iface, VARIANT_BOOL *p) { HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRBool defer = FALSE; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_INVALIDARG; + + nsres = nsIDOMHTMLScriptElement_GetDefer(This->nsscript, &defer); + if(NS_FAILED(nsres)) { + ERR("GetSrc failed: %08x\n", nsres); + } + + *p = defer ? VARIANT_TRUE : VARIANT_FALSE; + + TRACE("*p = %d\n", *p); + return S_OK; } static HRESULT WINAPI HTMLScriptElement_get_readyState(IHTMLScriptElement *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4378be1..7ba6e86 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3433,10 +3433,26 @@ static void test_elems(IHTMLDocument2 *doc) hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLScriptElement, (void**)&script); ok(hres == S_OK, "Could not get IHTMLScriptElement interface: %08x\n", hres); - hres = IHTMLScriptElement_get_type(script, &type); - ok(hres == S_OK, "get_type failed: %08x\n", hres); - ok(!lstrcmpW(type, text_javascriptW), "Unexpected type %s\n", dbgstr_w(type)); - SysFreeString(type); + if(hres == S_OK) + { + VARIANT_BOOL vb; + + hres = IHTMLScriptElement_get_type(script, &type); + ok(hres == S_OK, "get_type failed: %08x\n", hres); + ok(!lstrcmpW(type, text_javascriptW), "Unexpected type %s\n", dbgstr_w(type)); + SysFreeString(type); + + /* test defer */ + hres = IHTMLScriptElement_put_defer(script, VARIANT_TRUE); + ok(hres == S_OK, "get_type failed: %08x\n", hres); + + hres = IHTMLScriptElement_get_defer(script, &vb); + ok(hres == S_OK, "get_type failed: %08x\n", hres); + ok(vb == VARIANT_TRUE, "get_type failed: %08x\n", hres); + + hres = IHTMLScriptElement_put_defer(script, VARIANT_FALSE); + ok(hres == S_OK, "get_type failed: %08x\n", hres); + } IHTMLScriptElement_Release(script); }

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/put fontVariant.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: 8e984bcc6127484eeb4f57741b2db8e580308cb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e984bcc6127484eeb4f57741… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Dec 11 22:37:18 2008 +1100 mshtml: Implement IHTMLStyle get/put fontVariant. --- dlls/mshtml/htmlstyle.c | 24 ++++++++++++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 26 ++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 208b6fb..c8f8594 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -61,6 +61,8 @@ static const WCHAR attrFontSize[] = {'f','o','n','t','-','s','i','z','e',0}; static const WCHAR attrFontStyle[] = {'f','o','n','t','-','s','t','y','l','e',0}; +static const WCHAR attrFontVariant[] = + {'f','o','n','t','-','v','a','r','i','a','n','t',0}; static const WCHAR attrFontWeight[] = {'f','o','n','t','-','w','e','i','g','h','t',0}; static const WCHAR attrHeight[] = @@ -111,6 +113,7 @@ static const struct{ {attrFontFamily, DISPID_IHTMLSTYLE_FONTFAMILY}, {attrFontSize, DISPID_IHTMLSTYLE_FONTSIZE}, {attrFontStyle, DISPID_IHTMLSTYLE_FONTSTYLE}, + {attrFontVariant, DISPID_IHTMLSTYLE_FONTVARIANT}, {attrFontWeight, DISPID_IHTMLSTYLE_FONTWEIGHT}, {attrHeight, DISPID_IHTMLSTYLE_HEIGHT}, {attrLeft, DISPID_IHTMLSTYLE_LEFT}, @@ -544,15 +547,28 @@ static HRESULT WINAPI HTMLStyle_get_fontStyle(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_fontVariant(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + static const WCHAR szCaps[] = {'s','m','a','l','l','-','c','a','p','s',0}; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + /* fontVariant can only be one of the follow values. */ + if(!v || strcmpiW(szNormal, v) == 0 || strcmpiW(szCaps, v) == 0) + { + return set_nsstyle_attr(This->nsstyle, STYLEID_FONT_VARIANT, v, 0); + } + + return E_INVALIDARG; } static HRESULT WINAPI HTMLStyle_get_fontVariant(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_INVALIDARG; + + return get_style_attr(This, STYLEID_FONT_VARIANT, p); } static HRESULT WINAPI HTMLStyle_put_fontWeight(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 6c45553..5fe1f24 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -44,6 +44,7 @@ typedef enum { STYLEID_FONT_FAMILY, STYLEID_FONT_SIZE, STYLEID_FONT_STYLE, + STYLEID_FONT_VARIANT, STYLEID_FONT_WEIGHT, STYLEID_HEIGHT, STYLEID_LEFT, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7410687..4378be1 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2309,6 +2309,32 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); ok(!str, "fontWeight = %s\n", dbgstr_w(str)); + /* font Variant */ + hres = IHTMLStyle_get_fontVariant(style, NULL); + ok(hres == E_INVALIDARG, "get_fontVariant failed: %08x\n", hres); + + hres = IHTMLStyle_get_fontVariant(style, &sDefault); + ok(hres == S_OK, "get_fontVariant failed: %08x\n", hres); + + str = a2bstr("test"); + hres = IHTMLStyle_put_fontVariant(style, str); + ok(hres == E_INVALIDARG, "fontVariant failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("small-caps"); + hres = IHTMLStyle_put_fontVariant(style, str); + ok(hres == S_OK, "fontVariant failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("normal"); + hres = IHTMLStyle_put_fontVariant(style, str); + ok(hres == S_OK, "fontVariant failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_put_fontVariant(style, sDefault); + ok(hres == S_OK, "fontVariant failed: %08x\n", hres); + SysFreeString(sDefault); + str = (void*)0xdeadbeef; hres = IHTMLStyle_get_display(style, &str); ok(hres == S_OK, "get_display failed: %08x\n", hres);

1 0

Francois Gouget : devenum: French and German should use SUBLANG_NEUTRAL.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: 5a8e31a386526ca04fd0e709efac9afcf294a34b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a8e31a386526ca04fd0e709e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 12 10:31:24 2008 +0100 devenum: French and German should use SUBLANG_NEUTRAL. --- dlls/devenum/devenum.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index be97d49..7aa6c50 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -45,7 +45,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT } STRINGTABLE DISCARDABLE -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL { 7 "DirectSound par défaut" 8 "DirectSound : %s" @@ -54,7 +54,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT } STRINGTABLE DISCARDABLE -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL { 7 "Standard DirectSound" 8 "DirectSound: %s"

1 0

Francois Gouget : wininet & winhttp: Remove the MSG_WAITALL definition as it is not needed.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: a6c07ffba4b2b37d01affb4c39f032bb5f8d34bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6c07ffba4b2b37d01affb4c3… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:30:09 2008 +0100 wininet & winhttp: Remove the MSG_WAITALL definition as it is not needed. --- dlls/winhttp/winhttp_private.h | 3 --- dlls/wininet/internet.h | 6 +----- 2 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index b564d4f..5043235 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -34,9 +34,6 @@ #endif #if defined(__MINGW32__) || defined (_MSC_VER) # include <ws2tcpip.h> -# ifndef MSG_WAITALL -# define MSG_WAITALL 0 -# endif #else # define closesocket close # define ioctlsocket ioctl diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index d8da781..8de85ff 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -42,11 +42,7 @@ # include <sys/socket.h> #endif -#if defined(__MINGW32__) || defined (_MSC_VER) -#ifndef MSG_WAITALL -#define MSG_WAITALL 0 -#endif -#else +#if !defined(__MINGW32__) && !defined(_MSC_VER) #define closesocket close #define ioctlsocket ioctl #endif /* __MINGW32__ */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2008