November 2010 - Wine-commits

Maarten Lankhorst : winegstreamer: Fix GetState.
by Alexandre Julliard 10 Nov '10

10 Nov '10

Module: wine Branch: master Commit: 482541447b3c9ecb978bbed4b863f3cf6916767e URL: http://source.winehq.org/git/wine.git/?a=commit;h=482541447b3c9ecb978bbed4b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 10 09:00:23 2010 +0100 winegstreamer: Fix GetState. --- dlls/winegstreamer/gstdemux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1c4b796..709dc42 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1180,7 +1180,7 @@ static HRESULT WINAPI GST_GetState(IBaseFilter *iface, DWORD dwMilliSecsTimeout, TRACE("(%d, %p)\n", dwMilliSecsTimeout, pState); if (!This->gstfilter) { - pState = State_Stopped; + *pState = State_Stopped; return S_OK; }

1 0

Henri Verbeet : ddraw: Make switching to/ from fullscreen work more than once.
by Alexandre Julliard 10 Nov '10

10 Nov '10

Module: wine Branch: master Commit: 2b0684c56db343112d845e0b277bf831f6b578df URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b0684c56db343112d845e0b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 10 10:53:02 2010 +0100 ddraw: Make switching to/from fullscreen work more than once. --- dlls/ddraw/ddraw.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e155482..b9ff201 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -647,15 +647,12 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, && (hwnd != window || !(cooplevel & DDSCL_EXCLUSIVE))) IWineD3DDevice_ReleaseFocusWindow(This->wineD3DDevice); - /* Do we switch from fullscreen to non-fullscreen ? */ - if (!(cooplevel & DDSCL_FULLSCREEN) && (This->cooperative_level & DDSCL_FULLSCREEN)) - { - IWineD3DDevice_RestoreFullscreenWindow(This->wineD3DDevice, This->dest_window); - } - - /* Don't override focus windows or private device windows */ - if (hwnd && !This->focuswindow && !This->devicewindow && (hwnd != window)) + if ((cooplevel & DDSCL_FULLSCREEN) != (This->cooperative_level & DDSCL_FULLSCREEN) || hwnd != window) { + if (This->cooperative_level & DDSCL_FULLSCREEN) + { + IWineD3DDevice_RestoreFullscreenWindow(This->wineD3DDevice, window); + } if (cooplevel & DDSCL_FULLSCREEN) { WINED3DDISPLAYMODE display_mode; @@ -663,7 +660,6 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, IWineD3D_GetAdapterDisplayMode(This->wineD3D, WINED3DADAPTER_DEFAULT, &display_mode); IWineD3DDevice_SetupFullscreenWindow(This->wineD3DDevice, hwnd, display_mode.Width, display_mode.Height); } - This->dest_window = hwnd; } if ((cooplevel & DDSCL_EXCLUSIVE) @@ -678,6 +674,10 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, } } + /* Don't override focus windows or private device windows */ + if (hwnd && !This->focuswindow && !This->devicewindow && (hwnd != window)) + This->dest_window = hwnd; + if(cooplevel & DDSCL_CREATEDEVICEWINDOW) { /* Don't create a device window if a focus window is set */

1 0

Henri Verbeet : wined3d: Register a window only once.
by Alexandre Julliard 10 Nov '10

10 Nov '10

Module: wine Branch: master Commit: 9a1fddb0fd8f0d5c2c8601a9eadfe7737598c007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a1fddb0fd8f0d5c2c8601a9e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 10 10:53:03 2010 +0100 wined3d: Register a window only once. --- dlls/wined3d/wined3d_main.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 0932351..0e44702 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -422,6 +422,13 @@ BOOL wined3d_register_window(HWND window, IWineD3DDeviceImpl *device) wined3d_mutex_lock(); + if (wined3d_find_wndproc(window)) + { + wined3d_mutex_unlock(); + WARN("Window %p is already registered with wined3d.\n", window); + return TRUE; + } + if (wndproc_table.size == wndproc_table.count) { unsigned int new_size = max(1, wndproc_table.size * 2);

1 0

Henri Verbeet : wined3d: Don' t unregister a window unless the window proc is what we expect it to be.
by Alexandre Julliard 10 Nov '10

10 Nov '10

Module: wine Branch: master Commit: 7a354177b38c9451c938389576890a14d5c543fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a354177b38c9451c93838957… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 10 10:53:04 2010 +0100 wined3d: Don't unregister a window unless the window proc is what we expect it to be. In particular, if we'd unregister a window when the application replaced our window proc, but still forwards to us, we'd create a loop when we register the same window again later. --- dlls/ddraw/tests/d3d.c | 84 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_main.c | 52 +++++++++++++++++---------- 2 files changed, 115 insertions(+), 21 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 82fdedf..a8535a3 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3263,9 +3263,9 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM static void test_wndproc(void) { + LONG_PTR proc, ddraw_proc; IDirectDraw7 *ddraw7; WNDCLASSA wc = {0}; - LONG_PTR proc; HWND window; HRESULT hr; ULONG ref; @@ -3356,7 +3356,87 @@ static void test_wndproc(void) (LONG_PTR)test_proc, proc); /* The original window proc is only restored by ddraw if the current - * window proc matches the one ddraw set. */ + * window proc matches the one ddraw set. This also affects switching + * from DDSCL_NORMAL to DDSCL_EXCLUSIVE. */ + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); + if (FAILED(hr)) + { + skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); + return; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + ddraw_proc = proc; + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)DefWindowProcA, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)DefWindowProcA, proc); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)ddraw_proc); + ok(proc == (LONG_PTR)DefWindowProcA, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)DefWindowProcA, proc); + + ref = IDirectDraw7_Release(ddraw7); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); if (FAILED(hr)) { diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 0e44702..8cc2828 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -467,35 +467,49 @@ BOOL wined3d_register_window(HWND window, IWineD3DDeviceImpl *device) void wined3d_unregister_window(HWND window) { - unsigned int i; + struct wined3d_wndproc *entry, *last; + LONG_PTR proc; wined3d_mutex_lock(); - for (i = 0; i < wndproc_table.count; ++i) + + if (!(entry = wined3d_find_wndproc(window))) { - if (wndproc_table.entries[i].window == window) - { - struct wined3d_wndproc *entry = &wndproc_table.entries[i]; - struct wined3d_wndproc *last = &wndproc_table.entries[--wndproc_table.count]; + wined3d_mutex_unlock(); + ERR("Window %p is not registered with wined3d.\n", window); + return; + } - if (entry->unicode) - { - if (GetWindowLongPtrW(window, GWLP_WNDPROC) == (LONG_PTR)wined3d_wndproc) - SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); - } - else - { - if (GetWindowLongPtrA(window, GWLP_WNDPROC) == (LONG_PTR)wined3d_wndproc) - SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); - } - if (entry != last) *entry = *last; + if (entry->unicode) + { + proc = GetWindowLongPtrW(window, GWLP_WNDPROC); + if (proc != (LONG_PTR)wined3d_wndproc) + { wined3d_mutex_unlock(); + WARN("Not unregistering window %p, window proc %#lx doesn't match wined3d window proc %p.\n", + window, proc, wined3d_wndproc); + return; + } + SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); + } + else + { + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + if (proc != (LONG_PTR)wined3d_wndproc) + { + wined3d_mutex_unlock(); + WARN("Not unregistering window %p, window proc %#lx doesn't match wined3d window proc %p.\n", + window, proc, wined3d_wndproc); return; } + + SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); } - wined3d_mutex_unlock(); - ERR("Window %p is not registered with wined3d.\n", window); + last = &wndproc_table.entries[--wndproc_table.count]; + if (entry != last) *entry = *last; + + wined3d_mutex_unlock(); } /* At process attach */

1 0

Dmitry Timoshkov : gdi32: Remove broken check for WinXP.
by Alexandre Julliard 10 Nov '10

10 Nov '10

Module: wine Branch: master Commit: d419f2437251ad4fa08badcb34d6343493e5597a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d419f2437251ad4fa08badcb3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 10 20:38:55 2010 +0800 gdi32: Remove broken check for WinXP. --- dlls/gdi32/tests/font.c | 99 ++++++++++++++++++++++------------------------- 1 files changed, 46 insertions(+), 53 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index cede3aa..b200ca1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3185,8 +3185,6 @@ static void test_AddFontMemResource(void) void *font; DWORD font_size, num_fonts; HANDLE ret; - DEVMODEA dmA; - BOOL is_winxp; if (!pAddFontMemResourceEx || !pRemoveFontMemResourceEx) { @@ -3201,62 +3199,59 @@ static void test_AddFontMemResource(void) return; } - is_winxp = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dmA) && - (dmA.dmFields & DM_DISPLAYORIENTATION); - - if (is_winxp) - { - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(NULL, 0, NULL, NULL); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 0, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(NULL, 10, NULL, NULL); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 10, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(NULL, 0, NULL, &num_fonts); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 0, NULL, &num_fonts); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(NULL, 10, NULL, &num_fonts); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 10, NULL, &num_fonts); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(font, 0, NULL, NULL); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(font, 0, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(font, 10, NULL, NULL); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(font, 10, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - num_fonts = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(font, 0, NULL, &num_fonts); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); - ok(num_fonts == 0xdeadbeef, "number of loaded fonts should be 0xdeadbeef\n"); + num_fonts = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(font, 0, NULL, &num_fonts); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + ok(num_fonts == 0xdeadbeef, "number of loaded fonts should be 0xdeadbeef\n"); + if (0) /* hangs under windows 2000 */ + { num_fonts = 0xdeadbeef; SetLastError(0xdeadbeef); ret = pAddFontMemResourceEx(font, 10, NULL, &num_fonts); @@ -3266,8 +3261,6 @@ static void test_AddFontMemResource(void) GetLastError()); ok(num_fonts == 0xdeadbeef, "number of loaded fonts should be 0xdeadbeef\n"); } - else - win_skip("AddFontMemResourceEx invalid parameter tests are problematic on Win2k\n"); num_fonts = 0xdeadbeef; SetLastError(0xdeadbeef);

1 0

André Hentschel : mmdevapi/tests: Fix test on some 2k8 and mark those errors broken.
by Alexandre Julliard 10 Nov '10

10 Nov '10

Module: wine Branch: master Commit: fe75e958059bb301d140356a35faaab37a7a5669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe75e958059bb301d140356a3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 10 00:07:08 2010 +0100 mmdevapi/tests: Fix test on some 2k8 and mark those errors broken. --- dlls/mmdevapi/tests/render.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 254c94d..70d6b39 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -208,8 +208,9 @@ static void test_audioclient(IAudioClient *ac) hr = IAudioClient_SetEventHandle(ac, handle); ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED || - hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) || - hr == HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME) /* Some Vista */ + broken(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME)) || + broken(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) /* Some 2k8 */ || + broken(hr == HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME)) /* Some Vista */ , "SetEventHandle returns %08x\n", hr); hr = IAudioClient_Reset(ac);

1 0

Thomas Mullaly : urlmon: Simplified path canonicalization functions.
by Alexandre Julliard 10 Nov '10

10 Nov '10

Module: wine Branch: master Commit: 1d11185d443a08ddf50f834b8e30cefc8f295d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d11185d443a08ddf50f834b8… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Nov 8 21:23:01 2010 -0500 urlmon: Simplified path canonicalization functions. --- dlls/urlmon/uri.c | 65 ++++++++++++++++++---------------------------------- 1 files changed, 23 insertions(+), 42 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 6e4ed06..6ed71e1 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -2973,6 +2973,8 @@ static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, } for(; ptr < data->path+data->path_len; ++ptr) { + BOOL do_default_action = TRUE; + if(*ptr == '%' && !is_res) { const WCHAR *tmp = ptr; WCHAR val; @@ -2986,6 +2988,7 @@ static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, if(!computeOnly) pct_encode_val(*ptr, uri->canon_uri+uri->canon_len); uri->canon_len += 3; + do_default_action = FALSE; } else if((is_unreserved(val) && known_scheme) || (is_file && (is_unreserved(val) || is_reserved(val) || (val && flags&Uri_CREATE_FILE_USE_DOS_PATH && !is_forbidden_dos_path_char(val))))) { @@ -2995,41 +2998,33 @@ static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, ptr += 2; continue; - } else { - if(!computeOnly) - uri->canon_uri[uri->canon_len] = *ptr; - ++uri->canon_len; } } else if(*ptr == '/' && is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) { /* Convert the '/' back to a '\\'. */ if(!computeOnly) uri->canon_uri[uri->canon_len] = '\\'; ++uri->canon_len; + do_default_action = FALSE; } else if(*ptr == '\\' && known_scheme) { - if(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) { - /* Don't convert the '\\' to a '/'. */ - if(!computeOnly) - uri->canon_uri[uri->canon_len] = *ptr; - ++uri->canon_len; - } else { + if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH))) { + /* Convert '\\' into a '/'. */ if(!computeOnly) uri->canon_uri[uri->canon_len] = '/'; ++uri->canon_len; + do_default_action = FALSE; } } else if(known_scheme && !is_res && !is_unreserved(*ptr) && !is_reserved(*ptr) && (!(flags & Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS) || is_file)) { - if(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) { - /* Don't escape the character. */ - if(!computeOnly) - uri->canon_uri[uri->canon_len] = *ptr; - ++uri->canon_len; - } else { + if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH))) { /* Escape the forbidden character. */ if(!computeOnly) pct_encode_val(*ptr, uri->canon_uri+uri->canon_len); uri->canon_len += 3; + do_default_action = FALSE; } - } else { + } + + if(do_default_action) { if(!computeOnly) uri->canon_uri[uri->canon_len] = *ptr; ++uri->canon_len; @@ -3107,6 +3102,8 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla } for(ptr = data->path; ptr < data->path+data->path_len; ++ptr) { + BOOL do_default_action = TRUE; + if(*ptr == '%' && known_scheme) { WCHAR val = decode_pct_val(ptr); @@ -3117,47 +3114,31 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla ptr += 2; continue; - } else { - if(!computeOnly) - uri->canon_uri[uri->canon_len] = *ptr; - ++uri->canon_len; } } else if(*ptr == '/' && is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) { if(!computeOnly) uri->canon_uri[uri->canon_len] = '\\'; ++uri->canon_len; - } else if(*ptr == '\\' && is_file) { - if(!(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { + do_default_action = FALSE; + } else if(*ptr == '\\') { + if(is_file && !(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { /* Convert to a '/'. */ if(!computeOnly) uri->canon_uri[uri->canon_len] = '/'; ++uri->canon_len; - } else { - /* Just copy it over. */ - if(!computeOnly) - uri->canon_uri[uri->canon_len] = *ptr; - ++uri->canon_len; + do_default_action = FALSE; } } else if(known_scheme && !is_unreserved(*ptr) && !is_reserved(*ptr) && !(flags & Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS)) { - if(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) { - /* Forbidden characters aren't percent encoded for file schemes - * with USE_DOS_PATH set. - */ - if(!computeOnly) - uri->canon_uri[uri->canon_len] = *ptr; - ++uri->canon_len; - } else if(data->scheme_type == URL_SCHEME_MK && *ptr == '\\') { - /* MK URIs don't get '\\' percent encoded. */ - if(!computeOnly) - uri->canon_uri[uri->canon_len] = *ptr; - ++uri->canon_len; - } else { + if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH))) { if(!computeOnly) pct_encode_val(*ptr, uri->canon_uri+uri->canon_len); uri->canon_len += 3; + do_default_action = FALSE; } - } else { + } + + if(do_default_action) { if(!computeOnly) uri->canon_uri[uri->canon_len] = *ptr; ++uri->canon_len;

1 0

Michael Stefaniuc : include: Avoid a multi-character character constant.
by Alexandre Julliard 10 Nov '10

10 Nov '10

Module: wine Branch: master Commit: b6b7069f2f6571883c13480d0851ee743cb8b457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6b7069f2f6571883c13480d0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 10 01:18:28 2010 +0100 include: Avoid a multi-character character constant. Multi-character character constants aren't portable as their behaviour is compiler dependent according to the C standard (sparse). --- include/devicetopology.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/devicetopology.idl b/include/devicetopology.idl index 4dc182b..18bfa50 100644 --- a/include/devicetopology.idl +++ b/include/devicetopology.idl @@ -35,7 +35,7 @@ cpp_quote("#ifndef E_NOTFOUND") cpp_quote("#define E_NOTFOUND HRESULT_FROM_WIN32(ERROR_NOT_FOUND)") cpp_quote("#endif") -cpp_quote("#define DEVTOPO_HARDWARE_INITIATED_EVENTCONTEXT 'draH'") +cpp_quote("#define DEVTOPO_HARDWARE_INITIATED_EVENTCONTEXT 0x64726148 /* 'draH' */") cpp_quote("DEFINE_GUID(EVENTCONTEXT_VOLUMESLIDER, 0xe2c2e9de, 0x09b1, 0x4b04,0x84,0xe5, 0x07, 0x93, 0x12, 0x25, 0xee, 0x04);") cpp_quote("#define _IKsControl_")

1 0

Michael Stefaniuc : kernel32/tests: '\' needs to be escaped in a C string ( sparse).
by Alexandre Julliard 10 Nov '10

10 Nov '10

Module: wine Branch: master Commit: bb442a2a576fc8026dca8cbb5f460ee25262923b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb442a2a576fc8026dca8cbb5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 10 01:19:48 2010 +0100 kernel32/tests: '\' needs to be escaped in a C string (sparse). --- dlls/kernel32/tests/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 55d62aa..1ccafb7 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -362,7 +362,7 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive) for(unique=0;unique<3;unique++) { /* Nonexistent path */ - sprintf(invalid_dir, "%s\%s",tmppath,"non_existent_dir_1jwj3y32nb3"); + sprintf(invalid_dir, "%s\\%s",tmppath,"non_existent_dir_1jwj3y32nb3"); SetLastError(0xdeadbeef); ok(!GetTempFileNameA(invalid_dir,"tfn",unique,newdir),"GetTempFileNameA should have failed\n"); ok(GetLastError()==ERROR_DIRECTORY || broken(GetLastError()==ERROR_PATH_NOT_FOUND)/*win98*/,

1 0

Michael Stefaniuc : urlmon/tests: Escape '\' in C strings (sparse).
by Alexandre Julliard 10 Nov '10

10 Nov '10

Module: wine Branch: master Commit: 0f21814bbe293bd9efc84e9722b8161a582eab63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f21814bbe293bd9efc84e972… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 10 01:20:38 2010 +0100 urlmon/tests: Escape '\' in C strings (sparse). --- dlls/urlmon/tests/uri.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index b11a3a0..8c4fd38 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -3307,20 +3307,20 @@ static const uri_properties uri_tests[] = { } }, /* Allow more characters when Uri_CREATE_FILE_USE_DOS_PATH is specified */ - { "file:///c:/dir\%%61%20%5Fname/file%2A.html", Uri_CREATE_FILE_USE_DOS_PATH, S_OK, FALSE, + { "file:///c:/dir\\%%61%20%5Fname/file%2A.html", Uri_CREATE_FILE_USE_DOS_PATH, S_OK, FALSE, { - {"file://c:\\dir\%a _name\\file*.html",S_OK,FALSE}, + {"file://c:\\dir\\%a _name\\file*.html",S_OK,FALSE}, {"",S_FALSE,FALSE}, - {"file://c:\\dir\%a _name\\file*.html",S_OK,FALSE}, + {"file://c:\\dir\\%a _name\\file*.html",S_OK,FALSE}, {"",S_FALSE,FALSE}, {".html",S_OK,FALSE}, {"",S_FALSE,FALSE}, {"",S_FALSE,FALSE}, {"",S_FALSE,FALSE}, - {"c:\\dir\%a _name\\file*.html",S_OK,FALSE}, - {"c:\\dir\%a _name\\file*.html",S_OK,FALSE}, + {"c:\\dir\\%a _name\\file*.html",S_OK,FALSE}, + {"c:\\dir\\%a _name\\file*.html",S_OK,FALSE}, {"",S_FALSE,FALSE}, - {"file:///c:/dir\%%61%20%5Fname/file%2A.html",S_OK,FALSE}, + {"file:///c:/dir\\%%61%20%5Fname/file%2A.html",S_OK,FALSE}, {"file",S_OK,FALSE}, {"",S_FALSE,FALSE}, {"",S_FALSE,FALSE}

1 0